facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-05 06:18:07 +03:00
Code Issues Projects Releases Wiki Activity

stop using deprecated std::iterator

Browse Source 
Summary:
std::iterator is deprecated in C++17. Removing it fixes warnings in
the Clang/Windows build.

Reviewed By: genevievehelsel

Differential Revision: D23352927

fbshipit-source-id: 293e30909eaa8a7c4856a91930a3886ad0b19364
This commit is contained in:
Chad Austin 2020-08-26 17:06:38 -07:00 committed by Facebook GitHub Bot
parent cb6d4e7061
commit e505d33da7
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
eden/fs/utils/PathFuncs.h
View File

@ -19,6 +19,7 @@
#include <folly/Format.h>
#include <folly/String.h>
#include <folly/hash/Hash.h>
#include <iterator>
#include <optional>
#include <type_traits>
@ -445,9 +446,14 @@ class PathComponentBase : public PathBase<
* able to use ComposedPathIterator as vector constructor arguments.
*/
template <typename Piece, bool IsReverse>
class ComposedPathIterator
: public std::iterator<std::input_iterator_tag, const Piece> {
class ComposedPathIterator {
public:
using iterator_category = std::input_iterator_tag;
using value_type = const Piece;
using difference_type = std::ptrdiff_t;
using pointer = value_type*;
using reference = value_type&;
using position_type = folly::StringPiece::const_iterator;
explicit ComposedPathIterator() : path_(), pos_(nullptr) {}
@ -604,9 +610,14 @@ class ComposedPathIterator
* An iterator over components in a composed path.
*/
template <bool IsReverse>
class PathComponentIterator
: public std::iterator<std::input_iterator_tag, const PathComponentPiece> {
class PathComponentIterator {
public:
using iterator_category = std::input_iterator_tag;
using value_type = const PathComponentPiece;
using difference_type = std::ptrdiff_t;
using pointer = value_type*;
using reference = value_type&;
using position_type = folly::StringPiece::const_iterator;
enum EndEnum { END };
@ -1284,9 +1295,14 @@ class AbsolutePathBase : public ComposedPathBase<
* "foo/bar/baz"
*/
template <bool IsReverse>
class PathSuffixIterator
: public std::iterator<std::input_iterator_tag, const RelativePathPiece> {
class PathSuffixIterator {
public:
using iterator_category = std::input_iterator_tag;
using value_type = const RelativePathPiece;
using difference_type = std::ptrdiff_t;
using pointer = value_type*;
using reference = value_type&;
explicit PathSuffixIterator() {}
explicit PathSuffixIterator(folly::StringPiece path, size_t start = 0)
: path_{path}, start_{start} {}