diff options
| author | Phil Nash | 2013-12-14 23:04:06 +0000 |
|---|---|---|
| committer | Phil Nash | 2013-12-14 23:04:06 +0000 |
| commit | 2851b4a55aedfff183af4f76a3e1b63bf8a5fa94 (patch) | |
| tree | 1341a93668a817ca5581ff6177622cf4a8f3fcd1 | |
| parent | 9d7b77956c8165f1c5c95497beeaaa8e12f93dcb (diff) | |
| download | catch3-2851b4a55aedfff183af4f76a3e1b63bf8a5fa94.tar.gz | |
Try again with nullptr compatibility check in GCC
| -rw-r--r-- | include/internal/catch_compiler_capabilities.h | 2 | ||||
| -rw-r--r-- | 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 |