Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Try again with nullptr compatibility check in GCC

Commit
2851b4a55aedfff183af4f76a3e1b63bf8a5fa94
Author
Phil Nash ·
Parents
9d7b77956c81

Files · Download .tar.gz

Changes

 include/internal/catch_compiler_capabilities.h | 2 +-
 single_include/catch.hpp                       | 4 ++--
 2 files changed, 3 insertions(+), 3 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
diff --git a/single_include/catch.hpp b/single_include/catch.hpp
index 3fbd9eb4..67c21a8e 100644
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -1,6 +1,6 @@
 /*
  *  CATCH v1.0 build 19 (master branch)
- *  Generated: 2013-12-14 22:52:16.692380
+ *  Generated: 2013-12-14 23:03:34.298653
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -99,7 +99,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