diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-07-29 19:59:54 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-07-29 23:19:30 +0300 |
| commit | 4d79fa8382d4242340adeb922d4ad79df6d66a49 (patch) | |
| tree | 92db921d83b7d004ece91a50254448d62b0088ba /extern/gtest/include/gtest/gtest-printers.h | |
| parent | 37933cb048b050624c32ebaa0ac91636dec1c557 (diff) | |
Gtests: Re-apply strict compiler fixes
Diffstat (limited to 'extern/gtest/include/gtest/gtest-printers.h')
| -rw-r--r-- | extern/gtest/include/gtest/gtest-printers.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extern/gtest/include/gtest/gtest-printers.h b/extern/gtest/include/gtest/gtest-printers.h index 8a33164cb38..27a1edc3728 100644 --- a/extern/gtest/include/gtest/gtest-printers.h +++ b/extern/gtest/include/gtest/gtest-printers.h @@ -103,7 +103,7 @@ #include "gtest/internal/gtest-port.h" #include "gtest/internal/gtest-internal.h" -#if GTEST_HAS_STD_TUPLE_ +#if defined(GTEST_HAS_STD_TUPLE_) && GTEST_HAS_STD_TUPLE_ # include <tuple> #endif @@ -581,7 +581,7 @@ inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) { } #endif // GTEST_HAS_STD_WSTRING -#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_ +#if GTEST_HAS_TR1_TUPLE || (defined(GTEST_HAS_STD_TUPLE_) && GTEST_HAS_STD_TUPLE_) // Helper function for printing a tuple. T must be instantiated with // a tuple type. template <typename T> @@ -664,7 +664,7 @@ void PrintTo( } #endif // GTEST_HAS_TR1_TUPLE -#if GTEST_HAS_STD_TUPLE_ +#if defined(GTEST_HAS_STD_TUPLE_) && GTEST_HAS_STD_TUPLE_ template <typename... Types> void PrintTo(const ::std::tuple<Types...>& t, ::std::ostream* os) { PrintTupleTo(t, os); @@ -888,7 +888,7 @@ template <typename TupleT> const size_t TuplePolicy<TupleT>::tuple_size; #endif // GTEST_HAS_TR1_TUPLE -#if GTEST_HAS_STD_TUPLE_ +#if defined(GTEST_HAS_STD_TUPLE_) && GTEST_HAS_STD_TUPLE_ template <typename... Types> struct TuplePolicy< ::std::tuple<Types...> > { typedef ::std::tuple<Types...> Tuple; |