Unscoped tie should come from boost for now

diff --git a/pdns/comfun.cc b/pdns/comfun.cc
index 3884cdb8a0d85a89d709173a51f5e180b5354e55..aa854a6c701a20b0e1c70883641fd46f362c4a70 100644 (file)
--- a/pdns/comfun.cc
+++ b/pdns/comfun.cc
@@ -27,6 +27,7 @@
 #include <atomic>
 #include <thread>
 #include <unordered_set>
+#include <deque>
 #include "inflighter.cc"
 //#include "malloctrace.hh"
 StatBag S;
@@ -62,7 +63,7 @@ struct SendReceive
   typedef int Identifier;
   typedef DNSResult Answer; // ip 
   int d_socket;
-  deque<uint16_t> d_idqueue;
+  std::deque<uint16_t> d_idqueue;
     
   SendReceive(map<ComboAddress, namecount, ComboAddress::addressOnlyLessThan>& res) : d_res(res)
   {
@@ -191,7 +192,7 @@ struct SendReceiveRes
   typedef int Identifier;
   typedef RESResult Answer; // ip 
   int d_socket;
-  deque<uint16_t> d_idqueue;
+  std::deque<uint16_t> d_idqueue;
   map<DNSName, vector<ComboAddress>>& d_out;
   SendReceiveRes(const ComboAddress& remote, map<DNSName,vector<ComboAddress>>& out) : d_out(out)
   {

diff --git a/pdns/namespaces.hh b/pdns/namespaces.hh
index 4cdf8f7f821c88367b7942c714f7266271a9709f..5a6c6fc9b7dfa4a2be8f57a0e9179eb9df806592 100644 (file)
--- a/pdns/namespaces.hh
+++ b/pdns/namespaces.hh
@@ -32,9 +32,10 @@
 #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.
+// prefer the boost one for now. We might want to switch to std::tuple one day. Same for tie.
 using boost::make_tuple;
 using boost::tuple;
+using boost::tie;
 
 using std::cerr;
 using std::clog;
@@ -53,6 +54,5 @@ using std::runtime_error;
 using std::set;
 using std::shared_ptr;
 using std::string;
-using std::tie;
 using std::unique_ptr;
 using std::vector;

diff --git a/pdns/rec_channel.hh b/pdns/rec_channel.hh
index 395c1a165ce88cb95280cf1b5b3ca70df49b15e0..2ffccdef87c854ecb53d3e11b6eb9e362247e48c 100644 (file)
--- a/pdns/rec_channel.hh
+++ b/pdns/rec_channel.hh
@@ -91,7 +91,7 @@ std::vector<ComboAddress>* pleaseGetLargeAnswerRemotes();
 std::vector<ComboAddress>* pleaseGetTimeouts();
 DNSName getRegisteredName(const DNSName& dom);
 std::atomic<unsigned long>* getDynMetric(const std::string& str, const std::string& prometheusName);
-optional<uint64_t> getStatByName(const std::string& name);
+boost::optional<uint64_t> getStatByName(const std::string& name);
 bool isStatBlacklisted(StatComponent component, const std::string& name);
 void blacklistStat(StatComponent component, const string& name);
 void blacklistStats(StatComponent component, const string& stats);