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/test/gmock-matchers_test.cc | |
parent | a325ad2db5deb623eab740527e559b81c0f39d65 (diff) | |
download | googletest-a178cc7ef73ce7e6e7e688d3d5cbccfc3c1d5d6b.tar.gz googletest-a178cc7ef73ce7e6e7e688d3d5cbccfc3c1d5d6b.tar.bz2 googletest-a178cc7ef73ce7e6e7e688d3d5cbccfc3c1d5d6b.zip |
merge, again, IsRecursiveContainer
Diffstat (limited to 'googlemock/test/gmock-matchers_test.cc')
-rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index 829935ef..f7bf2a82 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -4526,6 +4526,7 @@ class Streamlike { class ConstIter; public: typedef ConstIter const_iterator; + typedef ConstIter iterator; typedef T value_type; template <typename InIter> |