Martin Hořeňovský
e1e6872c4c
This is both a really big and a really small commit. It is small in
that it only contains renaming, moving and modification of include
directives caused by this.
It is really big in the obvious way of touching something like 200
files.
The new rules for naming files is simple: headers use the `.hpp`
extension. The rules for physical file layout is still kinda in
progress, but the basics are also simple:
* Significant parts of functionality get their own subfolder
* Benchmarking is in `catch2/benchmark`
* Matchers are in `catch2/matchers`
* Generators are in `catch2/generators`
* Reporters are in `catch2/reporters`
* Baseline testing facilities are in `catch2/`
* Various top level folders also contain `internal` subfolder,
with files that users probably do not want to include directly,
at least not until they have to write something like their own
reporter.
* The exact files in these subfolders is likely to change later
on
Note that while some includes were cleaned up in this commit, it
is only the low hanging fruit and further cleanup using automatic
tooling will happen later.
Also note that various include guards, copyright notices and file
headers will also be standardized later, rather than in this commit.
68 lines
2.0 KiB
C++
68 lines
2.0 KiB
C++
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
|
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
|
|
|
#ifndef TWOBLUECUBES_CATCH_CONTAINER_NONMEMBERS_HPP_INCLUDED
|
|
#define TWOBLUECUBES_CATCH_CONTAINER_NONMEMBERS_HPP_INCLUDED
|
|
|
|
#include <catch2/internal/catch_compiler_capabilities.hpp>
|
|
|
|
|
|
// We want a simple polyfill over `std::empty`, `std::size` and so on
|
|
// for C++14 or C++ libraries with incomplete support.
|
|
// We also have to handle that MSVC std lib will happily provide these
|
|
// under older standards.
|
|
#if defined(CATCH_CPP17_OR_GREATER) || defined(_MSC_VER)
|
|
|
|
// We are already using this header either way, so there shouldn't
|
|
// be much additional overhead in including it to get the feature
|
|
// test macros
|
|
#include <string>
|
|
|
|
# if !defined(__cpp_lib_nonmember_container_access)
|
|
# define CATCH_CONFIG_POLYFILL_NONMEMBER_CONTAINER_ACCESS
|
|
# endif
|
|
|
|
#else
|
|
#define CATCH_CONFIG_POLYFILL_NONMEMBER_CONTAINER_ACCESS
|
|
#endif
|
|
|
|
|
|
|
|
namespace Catch {
|
|
namespace Detail {
|
|
|
|
#if defined(CATCH_CONFIG_POLYFILL_NONMEMBER_CONTAINER_ACCESS)
|
|
template <typename Container>
|
|
constexpr auto empty(Container const& cont) -> decltype(cont.empty()) {
|
|
return cont.empty();
|
|
}
|
|
template <typename T, std::size_t N>
|
|
constexpr bool empty(const T (&)[N]) noexcept {
|
|
// GCC < 7 does not support the const T(&)[] parameter syntax
|
|
// so we have to ignore the length explicitly
|
|
(void)N;
|
|
return false;
|
|
}
|
|
template <typename T>
|
|
constexpr bool empty(std::initializer_list<T> list) noexcept {
|
|
return list.size() > 0;
|
|
}
|
|
|
|
|
|
template <typename Container>
|
|
constexpr auto size(Container const& cont) -> decltype(cont.size()) {
|
|
return cont.size();
|
|
}
|
|
template <typename T, std::size_t N>
|
|
constexpr std::size_t size(const T(&)[N]) noexcept {
|
|
return N;
|
|
}
|
|
#endif // CATCH_CONFIG_POLYFILL_NONMEMBER_CONTAINER_ACCESS
|
|
|
|
} // end namespace Detail
|
|
} // end namespace Catch
|
|
|
|
|
|
|
|
#endif // TWOBLUECUBES_CATCH_CONTAINER_NONMEMBERS_HPP_INCLUDED
|