feedc0de/Catch2
1
0 Fork 0
forked from catchorg/Catch2
Code Pull Requests Activity

Removed CATCH_CONFIG_CPP11_NULLPTR for VS2015

Browse Source 
- as it was already there for VS2010 on
This commit is contained in:
Phil Nash committed 2015-05-19 22:38:30 +01:00
1 parent 318c936712
commit 43470b2606
2 files changed
+9 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/internal/catch_compiler_capabilities.h
+4 -6
View File
@@ -95,19 +95,17 @@
// Visual C++
#ifdef _MSC_VER
#if (_MSC_VER >= 1600)
#define CATCH_CONFIG_CPP11_NULLPTR
#endif
#if (_MSC_VER >= 1310 ) // (VC++ 7.0+)
//#define CATCH_CONFIG_SFINAE // Not confirmed
#endif
#if (_MSC_VER >= 1600)
#define CATCH_CONFIG_CPP11_NULLPTR
#endif
#if (_MSC_VER >= 1900 ) // (VC++ 13 (VS2015))
#define CATCH_CONFIG_CPP11_NOEXCEPT
#define CATCH_CONFIG_CPP11_GENERATED_METHODS
#define CATCH_CONFIG_CPP11_NULLPTR
//#define CATCH_CONFIG_SFINAE // Don't use, for now
#endif
#endif // _MSC_VER