diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-03-15 14:31:37 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-03-15 14:31:37 -0400 |
| commit | a178cc7ef73ce7e6e7e688d3d5cbccfc3c1d5d6b (patch) | |
| tree | c0cdf002f62ce0af852a61777e009c9968ef806f /googlemock/include | |
| parent | a325ad2db5deb623eab740527e559b81c0f39d65 (diff) | |
| download | googletest-a178cc7ef73ce7e6e7e688d3d5cbccfc3c1d5d6b.tar.gz googletest-a178cc7ef73ce7e6e7e688d3d5cbccfc3c1d5d6b.tar.bz2 googletest-a178cc7ef73ce7e6e7e688d3d5cbccfc3c1d5d6b.zip | |
merge, again, IsRecursiveContainer
Diffstat (limited to 'googlemock/include')
| -rw-r--r-- | googlemock/include/gmock/gmock-spec-builders.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h index c1b63014..f8e1c6ab 100644 --- a/googlemock/include/gmock/gmock-spec-builders.h +++ b/googlemock/include/gmock/gmock-spec-builders.h @@ -563,6 +563,7 @@ 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; |