summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaul Tambre <raul.tambre@cleveron.com>2021-11-05 13:01:19 +0200
committerRaul Tambre <raul.tambre@cleveron.com>2021-11-05 13:01:19 +0200
commit5d1e4af673fedad805921bb11e78d22286229148 (patch)
tree0856fc5a8d5fa69cfc97aa7e3478bdc020385b54
parentbf0701daa9f5b30e5882e2f8f9a5280bcba87e77 (diff)
downloadgoogletest-git-5d1e4af673fedad805921bb11e78d22286229148.tar.gz
Replace use of deprecated std::iterator
This was deprecated by P0174 in C++17.
-rw-r--r--googlemock/test/gmock-matchers_test.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc
index d1505bf0..beafb1a4 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) {}