diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-03-16 13:36:36 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-03-16 13:36:36 -0400 |
| commit | 080fcbe0aae28dec00c2903ea04f2d2b022deb12 (patch) | |
| tree | 3b6fc12bfdfec27cc96211c4ed4fa6e61b6eabc3 /googlemock | |
| parent | a178cc7ef73ce7e6e7e688d3d5cbccfc3c1d5d6b (diff) | |
| download | googletest-080fcbe0aae28dec00c2903ea04f2d2b022deb12.tar.gz googletest-080fcbe0aae28dec00c2903ea04f2d2b022deb12.tar.bz2 googletest-080fcbe0aae28dec00c2903ea04f2d2b022deb12.zip | |
cl 189032107
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 1 | ||||
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index f8e1c6ab..c1b63014 100644 --- a/googlemock/include/gmock/gmock-spec-builders.h +++ b/googlemock/include/gmock/gmock-spec-builders.h @@ -563,7 +563,6 @@ class ExpectationSet { public: // A bidirectional iterator that can read a const element in the set. typedef Expectation::Set::const_iterator const_iterator; - typedef Expectation::Set::iterator iterator; // An object stored in the set. This is an alias of Expectation. typedef Expectation::Set::value_type value_type; diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index f7bf2a82..829935ef 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -4526,7 +4526,6 @@ class Streamlike { class ConstIter; public: typedef ConstIter const_iterator; - typedef ConstIter iterator; typedef T value_type; template <typename InIter> |