merge, again, IsRecursiveContainer

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