merge, again, IsRecursiveContainer

2018-03-15 14:31:37 -04:00
parent 00b6ba1ca4
commit 78eb71c7e3
6 changed files with 123 additions and 20 deletions
--- 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>