gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed pre-C++11 IsContainerTest and IteratorTraits

Browse Source 
PiperOrigin-RevId: 215916605
This commit is contained in:
misterg
2018-10-05 12:22:40 -04:00
committed by Gennadiy Civil
parent 4bb49ed640
commit c28ce41590
1 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
googletest/include/gtest/internal/gtest-internal.h
View File

@@ -942,7 +942,6 @@ struct IsAProtocolMessage
// IsContainerTest(typename C::const_iterator*) and // IsContainerTest(typename C::const_iterator*) and
// IsContainerTest(...) doesn't work with Visual Age C++ and Sun C++. // IsContainerTest(...) doesn't work with Visual Age C++ and Sun C++.
typedef int IsContainer; typedef int IsContainer;
#if GTEST_LANG_CXX11
template <class C, template <class C,
class Iterator = decltype(::std::declval<const C&>().begin()), class Iterator = decltype(::std::declval<const C&>().begin()),
class = decltype(::std::declval<const C&>().end()), class = decltype(::std::declval<const C&>().end()),
@@ -952,14 +951,6 @@ template <class C,
IsContainer IsContainerTest(int /* dummy */) { IsContainer IsContainerTest(int /* dummy */) {
return 0; 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; typedef char IsNotContainer;
template <class C> template <class C>
@@ -1014,12 +1005,8 @@ struct IsRecursiveContainerImpl<C, true, false> : public false_type {};
template <typename C> template <typename C>
struct IsRecursiveContainerImpl<C, true, true> { struct IsRecursiveContainerImpl<C, true, true> {
#if GTEST_LANG_CXX11
typedef typename IteratorTraits<typename C::const_iterator>::value_type typedef typename IteratorTraits<typename C::const_iterator>::value_type
value_type; value_type;
#else
typedef typename IteratorTraits<typename C::iterator>::value_type value_type;
#endif
typedef is_same<value_type, C> type; typedef is_same<value_type, C> type;
}; };