From 16a7db036f04559a4d369b0b8a2b839c40eafbb5 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Thu, 18 Sep 2014 18:23:47 +0100 Subject: [PATCH] enable nullptr for VS2010 --- 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..5ed98c2f 100644 --- a/include/internal/catch_compiler_capabilities.h +++ b/include/internal/catch_compiler_capabilities.h @@ -80,6 +80,10 @@ // 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