Three more cases of tie or boost::tie

diff --git a/pdns/dnsdemog.cc b/pdns/dnsdemog.cc
index 6c400fa1ac71f8c34b248f201373b8036c7fd0e1..7c152d1b5811a4aaad32e16206d143a9be2da7d4 100644 (file)
--- 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
index 096d77e1dffd9c54d230a9e9bd6431b2cac82801..58b5463562c228f1e7cdde174109ffefd51b8b2c 100644 (file)
--- 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
index 3291e9e07324bece2fd5a97ba2d66acee2e819c2..e72ce55df2b48ff8e3fb1232949028318384c4e9 100644 (file)
--- 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;