From 73a0744452fc94c2b5c310e4b6957f35173a7cfa Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Wed, 17 Sep 2014 18:06:47 +0100 Subject: [PATCH] Backed out PR #307 (use nullptr from VS2005) as it seems clr specific --- include/internal/catch_compiler_capabilities.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/internal/catch_compiler_capabilities.h b/include/internal/catch_compiler_capabilities.h index 89073bec..76d0ffda 100644 --- a/include/internal/catch_compiler_capabilities.h +++ b/include/internal/catch_compiler_capabilities.h @@ -84,10 +84,6 @@ //#define CATCH_CONFIG_SFINAE // Not confirmed #endif -#if (_MSC_VER >= 1400) -#define CATCH_CONFIG_CPP11_NULLPTR -#endif - #endif // _MSC_VER // Use variadic macros if the compiler supports them