Detect C++11 support for Visual Studio 2015.

This commit is contained in:
Vaclav Zeman
2015-01-12 13:29:43 +01:00
parent b9ec8a10ed
commit 39f31c4cef
4 changed files with 19 additions and 9 deletions

View File

@@ -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)

View File

@@ -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