From 7f2cc312ff7cbfe513e5e3b74dabb0d977dbdf9d Mon Sep 17 00:00:00 2001 From: Andrei Pavel Date: Thu, 30 Jun 2022 17:07:26 +0300 Subject: [PATCH] [#2432] solve warning: std::binary_function is deprecated --- src/lib/dns/rrparamregistry-placeholder.cc | 6 ++---- src/lib/dns/rrparamregistry.cc | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/lib/dns/rrparamregistry-placeholder.cc b/src/lib/dns/rrparamregistry-placeholder.cc index 455c117d69..40214604c5 100644 --- a/src/lib/dns/rrparamregistry-placeholder.cc +++ b/src/lib/dns/rrparamregistry-placeholder.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2015 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2010-2022 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -47,9 +47,7 @@ CICharLess(char c1, char c2) { tolower(static_cast(c2))); } -struct CIStringLess : - public binary_function -{ +struct CIStringLess { bool operator()(const string& s1, const string& s2) const { return (lexicographical_compare(s1.begin(), s1.end(), diff --git a/src/lib/dns/rrparamregistry.cc b/src/lib/dns/rrparamregistry.cc index 9942b4cdd7..a8368b7a7a 100644 --- a/src/lib/dns/rrparamregistry.cc +++ b/src/lib/dns/rrparamregistry.cc @@ -5,7 +5,7 @@ /////////////// /////////////// -// Copyright (C) 2010-2021 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2010-2022 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -54,9 +54,7 @@ CICharLess(char c1, char c2) { tolower(static_cast(c2))); } -struct CIStringLess : - public binary_function -{ +struct CIStringLess { bool operator()(const string& s1, const string& s2) const { return (lexicographical_compare(s1.begin(), s1.end(),