diff options
author | Mark Mentovai <mark@chromium.org> | 2015-10-12 21:57:51 (GMT) |
---|---|---|
committer | Mark Mentovai <mark@chromium.org> | 2015-10-12 21:59:11 (GMT) |
commit | a0435dc6879c336ab29afd64c380995055d2cd53 (patch) | |
tree | 1c60ad95e95b30ee7d7f85c63666e01e17d93af8 /googlemock/include | |
parent | 7f4448f40b3f3f16a75787c016139511579367ed (diff) | |
download | googletest-a0435dc6879c336ab29afd64c380995055d2cd53.zip googletest-a0435dc6879c336ab29afd64c380995055d2cd53.tar.gz googletest-a0435dc6879c336ab29afd64c380995055d2cd53.tar.bz2 |
googlemock: Support C++11 language with pre-C++11 libraryrefs/pull/611/head
This guards use of <type_traits> and its features with
GTEST_HAS_STD_TYPE_TRAITS_, and std::function with
GTEST_HAS_STD_FUNCTION_.
Diffstat (limited to 'googlemock/include')
-rw-r--r-- | googlemock/include/gmock/gmock-actions.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/googlemock/include/gmock/gmock-actions.h b/googlemock/include/gmock/gmock-actions.h index c09c4d6..b3f654a 100644 --- a/googlemock/include/gmock/gmock-actions.h +++ b/googlemock/include/gmock/gmock-actions.h @@ -46,7 +46,7 @@ #include "gmock/internal/gmock-internal-utils.h" #include "gmock/internal/gmock-port.h" -#if GTEST_LANG_CXX11 // Defined by gtest-port.h via gmock-port.h. +#if GTEST_HAS_STD_TYPE_TRAITS_ // Defined by gtest-port.h via gmock-port.h. #include <type_traits> #endif @@ -96,7 +96,7 @@ struct BuiltInDefaultValueGetter<T, false> { template <typename T> class BuiltInDefaultValue { public: -#if GTEST_LANG_CXX11 +#if GTEST_HAS_STD_TYPE_TRAITS_ // This function returns true iff type T has a built-in default value. static bool Exists() { return ::std::is_default_constructible<T>::value; @@ -107,7 +107,7 @@ class BuiltInDefaultValue { T, ::std::is_default_constructible<T>::value>::Get(); } -#else // GTEST_LANG_CXX11 +#else // GTEST_HAS_STD_TYPE_TRAITS_ // This function returns true iff type T has a built-in default value. static bool Exists() { return false; @@ -117,7 +117,7 @@ class BuiltInDefaultValue { return BuiltInDefaultValueGetter<T, false>::Get(); } -#endif // GTEST_LANG_CXX11 +#endif // GTEST_HAS_STD_TYPE_TRAITS_ }; // This partial specialization says that we use the same built-in |