Skip to content

THRIFT-5698: remove use of deprecated std::iterator #3165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jens-G merged 1 commit into from
Jun 10, 2025
Merged

THRIFT-5698: remove use of deprecated std::iterator #3165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions lib/cpp/src/thrift/Thrift.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,11 @@
namespace apache {
namespace thrift {

class TEnumIterator
: public std::iterator<std::forward_iterator_tag, std::pair<int, const char*> > {
class TEnumIterator {
public:
using iterator_category = std::forward_iterator_tag;
using value_type = std::pair<int, const char*>;

TEnumIterator(int n, int* enums, const char** names)
: ii_(0), n_(n), enums_(enums), names_(names) {}

Expand Down
5 changes: 4 additions & 1 deletion lib/cpp/src/thrift/transport/TSocketUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ struct AddressResolutionHelper {
public:
using PtrOwnedList = std::unique_ptr<addrinfo, addrinfo_deleter>;

struct Iter : std::iterator<std::forward_iterator_tag, const addrinfo*> {
struct Iter {
using iterator_category = std::forward_iterator_tag;
using value_type = const addrinfo*;

value_type ptr = nullptr;

Iter() = default;
Expand Down
Loading