summaryrefslogtreecommitdiffstats
path: root/googletest
diff options
context:
space:
mode:
authormisterg <misterg@google.com>2018-10-05 16:22:40 (GMT)
committerGennadiy Civil <misterg@google.com>2018-10-05 16:54:21 (GMT)
commitc28ce4159060089cff896670188c7662caf9dd43 (patch)
tree576c602521fa192b553d0908d3bf25dac5eda08e /googletest
parent4bb49ed640e34e23187ad7ea689693ef9927033f (diff)
downloadgoogletest-c28ce4159060089cff896670188c7662caf9dd43.zip
googletest-c28ce4159060089cff896670188c7662caf9dd43.tar.gz
googletest-c28ce4159060089cff896670188c7662caf9dd43.tar.bz2
Removed pre-C++11 IsContainerTest and IteratorTraits
PiperOrigin-RevId: 215916605
Diffstat (limited to 'googletest')
-rw-r--r--googletest/include/gtest/internal/gtest-internal.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h
index ee0527a..0fe05e2 100644
--- a/googletest/include/gtest/internal/gtest-internal.h
+++ b/googletest/include/gtest/internal/gtest-internal.h
@@ -942,7 +942,6 @@ struct IsAProtocolMessage
// IsContainerTest(typename C::const_iterator*) and
// IsContainerTest(...) doesn't work with Visual Age C++ and Sun C++.
typedef int IsContainer;
-#if GTEST_LANG_CXX11
template <class C,
class Iterator = decltype(::std::declval<const C&>().begin()),
class = decltype(::std::declval<const C&>().end()),
@@ -952,14 +951,6 @@ template <class C,
IsContainer IsContainerTest(int /* dummy */) {
return 0;
}
-#else
-template <class C>
-IsContainer IsContainerTest(int /* dummy */,
- typename C::iterator* /* it */ = NULL,
- typename C::const_iterator* /* const_it */ = NULL) {
- return 0;
-}
-#endif // GTEST_LANG_CXX11
typedef char IsNotContainer;
template <class C>
@@ -1014,12 +1005,8 @@ struct IsRecursiveContainerImpl<C, true, false> : public false_type {};
template <typename C>
struct IsRecursiveContainerImpl<C, true, true> {
- #if GTEST_LANG_CXX11
typedef typename IteratorTraits<typename C::const_iterator>::value_type
value_type;
-#else
- typedef typename IteratorTraits<typename C::iterator>::value_type value_type;
-#endif
typedef is_same<value_type, C> type;
};