mirror of
https://github.com/catchorg/Catch2.git
synced 2025-09-21 12:05:39 +02:00
Detect C++11 support for Visual Studio 2015.
This commit is contained in:
@@ -84,6 +84,10 @@
|
||||
//#define CATCH_CONFIG_SFINAE // Not confirmed
|
||||
#endif
|
||||
|
||||
#if (_MSC_VER >= 1900 ) // (VC++ 2015)
|
||||
#define CATCH_CONFIG_CPP11_NULLPTR
|
||||
#endif
|
||||
|
||||
#endif // _MSC_VER
|
||||
|
||||
// Use variadic macros if the compiler supports them
|
||||
@@ -102,7 +106,8 @@
|
||||
// C++ language feature support
|
||||
|
||||
// detect language version:
|
||||
#if (__cplusplus == 201103L)
|
||||
#if (__cplusplus == 201103L) || \
|
||||
(defined(_MSC_VER) && _MSC_VER >= 1900)
|
||||
# define CATCH_CPP11
|
||||
# define CATCH_CPP11_OR_GREATER
|
||||
#elif (__cplusplus >= 201103L)
|
||||
|
@@ -13,7 +13,7 @@
|
||||
namespace Catch {
|
||||
|
||||
// These numbers are maintained by a script
|
||||
Version libraryVersion( 1, 0, 53, "master" );
|
||||
Version libraryVersion( 1, 0, 55, "master" );
|
||||
}
|
||||
|
||||
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
|
||||
|
Reference in New Issue
Block a user