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

cl 189032107

Browse Source
This commit is contained in:
Gennadiy Civil 2018-03-16 13:36:36 -04:00
parent a178cc7ef7
commit 080fcbe0aa
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
googlemock/include/gmock/gmock-spec-builders.h
View File

@ -563,7 +563,6 @@ class ExpectationSet {
public: public:
// A bidirectional iterator that can read a const element in the set. // A bidirectional iterator that can read a const element in the set.
typedef Expectation::Set::const_iterator const_iterator; typedef Expectation::Set::const_iterator const_iterator;
typedef Expectation::Set::iterator iterator;
// An object stored in the set. This is an alias of Expectation. // An object stored in the set. This is an alias of Expectation.
typedef Expectation::Set::value_type value_type; typedef Expectation::Set::value_type value_type;

1
googlemock/test/gmock-matchers_test.cc
View File

@ -4526,7 +4526,6 @@ class Streamlike {
class ConstIter; class ConstIter;
public: public:
typedef ConstIter const_iterator; typedef ConstIter const_iterator;
typedef ConstIter iterator;
typedef T value_type; typedef T value_type;
template <typename InIter> template <typename InIter>

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

@ -940,27 +940,19 @@ struct IsRecursiveContainerImpl;
template <typename C> template <typename C>
struct IsRecursiveContainerImpl<C, false> : public false_type {}; struct IsRecursiveContainerImpl<C, false> : public false_type {};
// Since the IsRecursiveContainerImpl depends on the IsContainerTest we need to
// obey the same inconsistencies as the IsContainerTest, namely check if
// something is a container is relying on only const_iterator in C++11 and
// is relying on both const_iterator and iterator otherwise
template <typename C> template <typename C>
struct IsRecursiveContainerImpl<C, true> { struct IsRecursiveContainerImpl<C, true> {
template <typename T> #if GTEST_LANG_CXX11
struct VoidT { typedef typename IteratorTraits<typename C::const_iterator>::value_type
typedef void value_type; value_type;
};
template <typename C1, typename VT = void>
struct PathTraits {
typedef typename C1::const_iterator::value_type value_type;
};
template <typename C2>
struct PathTraits<
C2, typename VoidT<typename C2::iterator::value_type>::value_type> {
typedef typename C2::iterator::value_type value_type;
};
typedef typename IteratorTraits<typename C::iterator>::value_type value_type;
#if GTEST_LANG_CXX11
typedef std::is_same<value_type, C> type;
#else #else
typedef is_same<value_type, C> type; typedef typename IteratorTraits<typename C::iterator>::value_type value_type;
#endif #endif
typedef is_same<value_type, C> type;
}; };
// IsRecursiveContainer<Type> is a unary compile-time predicate that // IsRecursiveContainer<Type> is a unary compile-time predicate that