Three more cases of tie or boost::tie

PowerDNS · Feb 9, 2022 · f513779 · f513779
1 parent 1a09e47
commit f513779
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pdns/dnsdemog.cc b/pdns/dnsdemog.cc
@@ -44,7 +44,7 @@ struct Entry
 
   bool operator<(const struct Entry& rhs) const 
   {
-    return tie(ip, port, id) < tie(rhs.ip, rhs.port, rhs.id);
+    return std::tie(ip, port, id) < std::tie(rhs.ip, rhs.port, rhs.id);
   }
 };
 

diff --git a/pdns/ixfrutils.cc b/pdns/ixfrutils.cc
@@ -94,7 +94,7 @@ uint32_t getSerialFromRecords(const records_t& records, DNSRecord& soaret)
 {
   uint16_t t=QType::SOA;
 
-  auto found = records.equal_range(boost::tie(g_rootdnsname, t));
+  auto found = records.equal_range(std::tie(g_rootdnsname, t));
 
   for(auto iter = found.first; iter != found.second; ++iter) {
     auto soa = std::dynamic_pointer_cast<SOARecordContent>(iter->d_content);

diff --git a/pdns/ixplore.cc b/pdns/ixplore.cc
@@ -213,7 +213,7 @@ int main(int argc, char** argv) {
 
         for(const auto& rr : remove) {
           report<<'-'<< (rr.d_name+zone) <<" IN "<<DNSRecordContent::NumberToType(rr.d_type)<<" "<<rr.d_content->getZoneRepresentation()<<endl;
-          auto range = records.equal_range(tie(rr.d_name, rr.d_type, rr.d_class, rr.d_content));
+          auto range = records.equal_range(std::tie(rr.d_name, rr.d_type, rr.d_class, rr.d_content));
           if(range.first == range.second) {
             cout<<endl<<" !! Could not find record "<<rr.d_name<<" to remove!!"<<endl;
             //	  stop=true;
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,7 @@ struct Entry @@
       bool operator<(const struct Entry& rhs) const
       {
-        return tie(ip, port, id) < tie(rhs.ip, rhs.port, rhs.id);
+        return std::tie(ip, port, id) < std::tie(rhs.ip, rhs.port, rhs.id);
       }
     };
@@ Expand Down @@