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

summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorPhil Nash2013-12-14 23:04:06 +0000
committerPhil Nash2013-12-14 23:04:06 +0000
commit2851b4a55aedfff183af4f76a3e1b63bf8a5fa94 (patch)
tree1341a93668a817ca5581ff6177622cf4a8f3fcd1 /include
parent9d7b77956c8165f1c5c95497beeaaa8e12f93dcb (diff)
downloadcatch3-2851b4a55aedfff183af4f76a3e1b63bf8a5fa94.tar.gz
Try again with nullptr compatibility check in GCC
Diffstat (limited to 'include')
-rw-r--r--include/internal/catch_compiler_capabilities.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/internal/catch_compiler_capabilities.h b/include/internal/catch_compiler_capabilities.h
index 905d7317..6b8b89be 100644
--- a/include/internal/catch_compiler_capabilities.h
+++ b/include/internal/catch_compiler_capabilities.h
@@ -66,7 +66,7 @@
#endif // __GNUC__ < 3
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || defined(__GXX_EXPERIMENTAL_CXX0X__)
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__) )
#define CATCH_CONFIG_CPP11_NULLPTR
#endif