Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2014-09-18 18:23:47 +0100
committerPhil Nash2014-09-18 18:23:47 +0100
commit16a7db036f04559a4d369b0b8a2b839c40eafbb5 (patch)
treee91a0599c621910be4f3aa7645f79eda9908fc79 /include
parent73a0744452fc94c2b5c310e4b6957f35173a7cfa (diff)
downloadcatch3-16a7db036f04559a4d369b0b8a2b839c40eafbb5.tar.gz
enable nullptr for VS2010
Diffstat (limited to 'include')
-rw-r--r--include/internal/catch_compiler_capabilities.h4
1 files changed, 4 insertions, 0 deletions
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