|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
/*
|
|
|
|
|
* Catch v2.13.0
|
|
|
|
|
* Generated: 2020-07-12 20:07:49.015950
|
|
|
|
|
* Catch v2.13.1
|
|
|
|
|
* Generated: 2020-09-07 12:12:38.090364
|
|
|
|
|
* ----------------------------------------------------------
|
|
|
|
|
* This file has been merged from multiple headers. Please don't edit it directly
|
|
|
|
|
* Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved.
|
|
|
|
@ -15,7 +15,7 @@
|
|
|
|
|
|
|
|
|
|
#define CATCH_VERSION_MAJOR 2
|
|
|
|
|
#define CATCH_VERSION_MINOR 13
|
|
|
|
|
#define CATCH_VERSION_PATCH 0
|
|
|
|
|
#define CATCH_VERSION_PATCH 1
|
|
|
|
|
|
|
|
|
|
#ifdef __clang__
|
|
|
|
|
# pragma clang system_header
|
|
|
|
@ -330,7 +330,10 @@ namespace Catch {
|
|
|
|
|
|
|
|
|
|
// Check if byte is available and usable
|
|
|
|
|
# if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
|
|
|
|
|
# define CATCH_INTERNAL_CONFIG_CPP17_BYTE
|
|
|
|
|
# include <cstddef>
|
|
|
|
|
# if __cpp_lib_byte > 0
|
|
|
|
|
# define CATCH_INTERNAL_CONFIG_CPP17_BYTE
|
|
|
|
|
# endif
|
|
|
|
|
# endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
|
|
|
|
|
|
|
|
|
|
// Check if variant is available and usable
|
|
|
|
@ -1105,7 +1108,7 @@ struct AutoReg : NonCopyable {
|
|
|
|
|
int index = 0; \
|
|
|
|
|
constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
|
|
|
|
|
using expander = int[];\
|
|
|
|
|
(void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++, 0)... };/* NOLINT */ \
|
|
|
|
|
(void)expander{(reg_test(Types{}, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
|
|
|
|
|
}\
|
|
|
|
|
};\
|
|
|
|
|
static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
|
|
|
|
@ -1151,7 +1154,7 @@ struct AutoReg : NonCopyable {
|
|
|
|
|
constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
|
|
|
|
|
constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
|
|
|
|
|
constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
|
|
|
|
|
(void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++, 0)... };/* NOLINT */\
|
|
|
|
|
(void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFuncName<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */\
|
|
|
|
|
} \
|
|
|
|
|
}; \
|
|
|
|
|
static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
|
|
|
|
@ -1195,7 +1198,7 @@ struct AutoReg : NonCopyable {
|
|
|
|
|
void reg_tests() { \
|
|
|
|
|
int index = 0; \
|
|
|
|
|
using expander = int[]; \
|
|
|
|
|
(void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++, 0)... };/* NOLINT */\
|
|
|
|
|
(void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestFunc<Types> ), CATCH_INTERNAL_LINEINFO, Catch::StringRef(), Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */\
|
|
|
|
|
} \
|
|
|
|
|
};\
|
|
|
|
|
static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
|
|
|
|
@ -1229,7 +1232,7 @@ struct AutoReg : NonCopyable {
|
|
|
|
|
int index = 0; \
|
|
|
|
|
constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, __VA_ARGS__)};\
|
|
|
|
|
using expander = int[];\
|
|
|
|
|
(void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++, 0)... };/* NOLINT */ \
|
|
|
|
|
(void)expander{(reg_test(Types{}, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index]), Tags } ), index++)... };/* NOLINT */ \
|
|
|
|
|
}\
|
|
|
|
|
};\
|
|
|
|
|
static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
|
|
|
|
@ -1278,7 +1281,7 @@ struct AutoReg : NonCopyable {
|
|
|
|
|
constexpr char const* tmpl_types[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TmplTypes))};\
|
|
|
|
|
constexpr char const* types_list[] = {CATCH_REC_LIST(INTERNAL_CATCH_STRINGIZE_WITHOUT_PARENS, INTERNAL_CATCH_REMOVE_PARENS(TypesList))};\
|
|
|
|
|
constexpr auto num_types = sizeof(types_list) / sizeof(types_list[0]);\
|
|
|
|
|
(void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++, 0)... };/* NOLINT */ \
|
|
|
|
|
(void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(tmpl_types[index / num_types]) + "<" + std::string(types_list[index % num_types]) + ">", Tags } ), index++)... };/* NOLINT */ \
|
|
|
|
|
}\
|
|
|
|
|
};\
|
|
|
|
|
static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
|
|
|
|
@ -1325,7 +1328,7 @@ struct AutoReg : NonCopyable {
|
|
|
|
|
void reg_tests(){\
|
|
|
|
|
int index = 0;\
|
|
|
|
|
using expander = int[];\
|
|
|
|
|
(void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++, 0)... };/* NOLINT */ \
|
|
|
|
|
(void)expander{(Catch::AutoReg( Catch::makeTestInvoker( &TestName<Types>::test ), CATCH_INTERNAL_LINEINFO, #ClassName, Catch::NameAndTags{ Name " - " + std::string(INTERNAL_CATCH_STRINGIZE(TmplList)) + " - " + std::to_string(index), Tags } ), index++)... };/* NOLINT */ \
|
|
|
|
|
}\
|
|
|
|
|
};\
|
|
|
|
|
static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
|
|
|
|
@ -1829,8 +1832,8 @@ namespace Catch {
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
namespace Detail {
|
|
|
|
|
template<typename InputIterator>
|
|
|
|
|
std::string rangeToString(InputIterator first, InputIterator last) {
|
|
|
|
|
template<typename InputIterator, typename Sentinel = InputIterator>
|
|
|
|
|
std::string rangeToString(InputIterator first, Sentinel last) {
|
|
|
|
|
ReusableStringStream rss;
|
|
|
|
|
rss << "{ ";
|
|
|
|
|
if (first != last) {
|
|
|
|
@ -15238,7 +15241,7 @@ namespace Catch {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Version const& libraryVersion() {
|
|
|
|
|
static Version version( 2, 13, 0, "", 0 );
|
|
|
|
|
static Version version( 2, 13, 1, "", 0 );
|
|
|
|
|
return version;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|