diff options
| author | dinord <dino.radakovich@gmail.com> | 2021-11-12 18:00:07 (GMT) |
|---|---|---|
| committer | dinord <dino.radakovich@gmail.com> | 2021-11-12 18:00:07 (GMT) |
| commit | 25208a60a27c2e634f46327595b281cb67355700 (patch) | |
| tree | 9883d3405afe9b9e92cb86628e118843edc85fcb | |
| parent | 9ca071b6e55568dff6960bebe1a5cfaa180fb3ce (diff) | |
| parent | 5d1e4af673fedad805921bb11e78d22286229148 (diff) | |
| download | googletest-25208a60a27c2e634f46327595b281cb67355700.zip googletest-25208a60a27c2e634f46327595b281cb67355700.tar.gz googletest-25208a60a27c2e634f46327595b281cb67355700.tar.bz2 | |
Merge pull request #3650 from tambry:std_iterator
PiperOrigin-RevId: 409417242
| -rw-r--r-- | googlemock/test/gmock-matchers_test.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index d1505bf..beafb1a 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -5424,12 +5424,14 @@ class Streamlike { } private: - class ConstIter : public std::iterator<std::input_iterator_tag, - value_type, - ptrdiff_t, - const value_type*, - const value_type&> { + class ConstIter { public: + using iterator_category = std::input_iterator_tag; + using value_type = T; + using difference_type = ptrdiff_t; + using pointer = const value_type*; + using reference = const value_type&; + ConstIter(const Streamlike* s, typename std::list<value_type>::iterator pos) : s_(s), pos_(pos) {} |