From 43470b260616b7018be68e7b737f31e9a38dfda1 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Tue, 19 May 2015 22:37:23 +0100 Subject: [PATCH] Removed CATCH_CONFIG_CPP11_NULLPTR for VS2015 - as it was already there for VS2010 on --- include/internal/catch_compiler_capabilities.h | 10 ++++------ single_include/catch.hpp | 12 +++++------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/include/internal/catch_compiler_capabilities.h b/include/internal/catch_compiler_capabilities.h index 983b7fa3..7ebd0e39 100644 --- a/include/internal/catch_compiler_capabilities.h +++ b/include/internal/catch_compiler_capabilities.h @@ -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 diff --git a/single_include/catch.hpp b/single_include/catch.hpp index f065227b..2fc37c3c 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* * CATCH v1.1 build 2 (master branch) - * Generated: 2015-05-19 22:28:31.909693 + * Generated: 2015-05-19 22:36:34.575371 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -154,19 +154,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