diff options
author | Craig Scott <craig.scott@crascit.com> | 2019-01-04 21:48:59 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-04 21:49:07 (GMT) |
commit | f789441179fb4bc8df01d6a5ec6c235553164d3e (patch) | |
tree | f1c15e7512a11da9e4185731394db88627bb9b39 | |
parent | aaf7c94ddb9d906baff34141e65623e2bee98020 (diff) | |
parent | 1b135cdff26e36fdd846edd2625e7edd7943b0b4 (diff) | |
download | CMake-f789441179fb4bc8df01d6a5ec6c235553164d3e.zip CMake-f789441179fb4bc8df01d6a5ec6c235553164d3e.tar.gz CMake-f789441179fb4bc8df01d6a5ec6c235553164d3e.tar.bz2 |
Merge topic 'remove-std-iterator'
1b135cdff2 cmLinkedTree: Remove deprecated std::iterator
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2767
-rw-r--r-- | Source/cmLinkedTree.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmLinkedTree.h b/Source/cmLinkedTree.h index 975f052..099fb6d 100644 --- a/Source/cmLinkedTree.h +++ b/Source/cmLinkedTree.h @@ -6,7 +6,6 @@ #include "cmConfigure.h" // IWYU pragma: keep #include <assert.h> -#include <iterator> #include <vector> /** @@ -33,7 +32,7 @@ class cmLinkedTree typedef T& ReferenceType; public: - class iterator : public std::iterator<std::forward_iterator_tag, T> + class iterator { friend class cmLinkedTree; cmLinkedTree* Tree; |