mirror of
https://github.com/catchorg/Catch2.git
synced 2024-12-23 11:43:29 +01:00
Compile in CATCH_CONFIG_CPP11_NULLPTR for some compilers
This commit is contained in:
parent
b4625208d0
commit
563429d9a3
@ -10,6 +10,17 @@
|
|||||||
|
|
||||||
// Much of the following code is based on Boost (1.53)
|
// 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
|
// Borland
|
||||||
#ifdef __BORLANDC__
|
#ifdef __BORLANDC__
|
||||||
@ -56,6 +67,11 @@
|
|||||||
|
|
||||||
#endif // __GNUC__ < 3
|
#endif // __GNUC__ < 3
|
||||||
|
|
||||||
|
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || defined(__GXX_EXPERIMENTAL_CXX0X__)
|
||||||
|
|
||||||
|
#define CATCH_CONFIG_CPP11_NULLPTR
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#endif // __GNUC__
|
#endif // __GNUC__
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user