diff options
| author | Martin Hořeňovský | 2017-01-26 18:47:29 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2017-01-26 18:47:29 +0100 |
| commit | 60a9ac7e65a57d82a92eebb7c8c6c1111a75897e (patch) | |
| tree | 5e06df8d0476121ab77e6932b3c526ca10020450 /include | |
| parent | c06afe438e261deac5658935a86cc9168ae4ed43 (diff) | |
| download | catch3-60a9ac7e65a57d82a92eebb7c8c6c1111a75897e.tar.gz | |
Enabled previous commit under MSVC, introduced new feature toggle
Diffstat (limited to 'include')
| -rw-r--r-- | include/internal/catch_approx.hpp | 4 | ||||
| -rw-r--r-- | include/internal/catch_compiler_capabilities.h | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/include/internal/catch_approx.hpp b/include/internal/catch_approx.hpp index 87d40fe9..f1937427 100644 --- a/include/internal/catch_approx.hpp +++ b/include/internal/catch_approx.hpp @@ -13,7 +13,7 @@ #include <cmath> #include <limits> -#if defined(CATCH_CPP11_OR_GREATER) +#if defined(CATCH_CONFIG_CPP11_TYPE_TRAITS) #include <type_traits> #endif @@ -45,7 +45,7 @@ namespace Detail { return approx; } -#if defined(CATCH_CPP11_OR_GREATER) +#if defined(CATCH_CONFIG_CPP11_TYPE_TRAITS) template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type> friend bool operator == ( const T& lhs, Approx const& rhs ) { // Thanks to Richard Harris for his help refining this formula diff --git a/include/internal/catch_compiler_capabilities.h b/include/internal/catch_compiler_capabilities.h index f3dfdf81..2b947fbd 100644 --- a/include/internal/catch_compiler_capabilities.h +++ b/include/internal/catch_compiler_capabilities.h @@ -19,6 +19,8 @@ // CATCH_CONFIG_CPP11_LONG_LONG : is long long supported? // CATCH_CONFIG_CPP11_OVERRIDE : is override supported? // CATCH_CONFIG_CPP11_UNIQUE_PTR : is unique_ptr supported (otherwise use auto_ptr) +// CATCH_CONFIG_CPP11_SHUFFLE : is std::shuffle supported? +// CATCH_CONFIG_CPP11_TYPE_TRAITS : are type_traits and enable_if supported? // CATCH_CONFIG_CPP11_OR_GREATER : Is C++11 supported? @@ -116,6 +118,7 @@ #define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT #define CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS #define CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE +#define CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS #endif #endif // _MSC_VER @@ -184,6 +187,9 @@ # if !defined(CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE) # define CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE # endif +# if !defined(CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS) +# define CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS +# endif #endif // __cplusplus >= 201103L @@ -224,6 +230,9 @@ #if defined(CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE) && !defined(CATCH_CONFIG_CPP11_NO_SHUFFLE) && !defined(CATCH_CONFIG_CPP11_SHUFFLE) && !defined(CATCH_CONFIG_NO_CPP11) # define CATCH_CONFIG_CPP11_SHUFFLE #endif +# if defined(CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS) && !defined(CATCH_CONFIG_CPP11_NO_TYPE_TRAITS) && !defined(CATCH_CONFIG_CPP11_TYPE_TRAITS) && !defined(CATCH_CONFIG_NO_CPP11) +# define CATCH_CONFIG_CPP11_TYPE_TRAITS +# endif #if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) # define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS |