From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Wed, 4 Nov 2020 13:09:19 +0000 (+0100)
Subject: Keep on using boost::tuple, switching to std::tuple introduces
X-Git-Tag: dnsdist-1.6.0-alpha0~7^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c16ee3b72f81f9ad019e156d8920b8a9937a3ae5;p=thirdparty%2Fpdns.git

Keep on using boost::tuple, switching to std::tuple introduces
a few issues.
---

diff --git a/pdns/ixfrutils.cc b/pdns/ixfrutils.cc
index 9d94c82150..096d77e1df 100644
--- 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(tie(g_rootdnsname, t));
+  auto found = records.equal_range(boost::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/namespaces.hh b/pdns/namespaces.hh
index b0bf01c8f6..4cdf8f7f82 100644
--- a/pdns/namespaces.hh
+++ b/pdns/namespaces.hh
@@ -21,6 +21,7 @@
  */
 #pragma once
 
+#include <boost/tuple/tuple.hpp>
 #include <boost/format.hpp>
 #include <boost/optional.hpp>
 #include <iostream>
@@ -28,16 +29,19 @@
 #include <memory>
 #include <set>
 #include <string>
-#include <tuple>
 #include <vector>
 
+// We have a few paces where boost::tuple is used, and other places where an unscoped tuple is used
+// use the boost one for now. We might want to switch to std::tuple  one day.
+using boost::make_tuple;
+using boost::tuple;
+
 using std::cerr;
 using std::clog;
 using std::cout;
 using std::endl;
 using std::ifstream;
 using std::make_pair;
-using std::make_tuple;
 using std::map;
 using std::max;
 using std::min;
@@ -50,6 +54,5 @@ using std::set;
 using std::shared_ptr;
 using std::string;
 using std::tie;
-using std::tuple;
 using std::unique_ptr;
 using std::vector;