From 3eefa7f53709b5a6478a8bedf52939274ba0b182 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Tue, 2 Sep 2014 08:30:57 +0100 Subject: [PATCH] use nullptr in MSVC from 2005+ (based on PR #307 - thanks alex85k) --- include/internal/catch_compiler_capabilities.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/internal/catch_compiler_capabilities.h b/include/internal/catch_compiler_capabilities.h index 76d0ffda..89073bec 100644 --- a/include/internal/catch_compiler_capabilities.h +++ b/include/internal/catch_compiler_capabilities.h @@ -84,6 +84,10 @@ //#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