catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Compile in CATCH_CONFIG_CPP11_NULLPTR for some compilers
- Commit
563429d9a34b6a10ea0484a1eeda6595d66b54ef- Author
- Phil Nash ·
- Parents
b4625208d01f
Changes
include/internal/catch_compiler_capabilities.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/internal/catch_compiler_capabilities.h b/include/internal/catch_compiler_capabilities.h index 8191e967..0644f9c0 100644 --- a/include/internal/catch_compiler_capabilities.h +++ b/include/internal/catch_compiler_capabilities.h @@ -10,6 +10,17 @@ // Much of the following code is based on Boost (1.53) +#ifdef __clang__ +#define CATCH_CONFIG_CPP11_NULLPTR + +#if __has_feature(cxx_nullptr) + +#define CATCH_CONFIG_CPP11_NULLPTR + +#endif + +#endif // __clang__ + //////////////////////////////////////////////////////////////////////////////// // Borland #ifdef __BORLANDC__ @@ -56,6 +67,11 @@ #endif // __GNUC__ < 3 +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || defined(__GXX_EXPERIMENTAL_CXX0X__) + +#define CATCH_CONFIG_CPP11_NULLPTR +#endif + #endif // __GNUC__