From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 26 Aug 2016 15:52:48 +0000 (+0200)
Subject: dnsdist: tuple requires make_tuple to initialize
X-Git-Tag: dnsdist-1.1.0-beta1~11^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75eee88a860d6345b09d252d8a8c59d7c56b6589;p=thirdparty%2Fpdns.git

dnsdist: tuple requires make_tuple to initialize

Fix compilation on Ubuntu Xenial.
Reported by Christof Chen (thanks!).
---

diff --git a/pdns/dnsdist-dynbpf.cc b/pdns/dnsdist-dynbpf.cc
index d0049d69ce..5550931e5e 100644
--- a/pdns/dnsdist-dynbpf.cc
+++ b/pdns/dnsdist-dynbpf.cc
@@ -69,7 +69,7 @@ std::vector<std::tuple<ComboAddress, uint64_t, struct timespec> > DynBPFFilter::
   for (const auto& stat : stats) {
     const container_t::iterator it = d_entries.find(stat.first);
     if (it != d_entries.end()) {
-      result.push_back({stat.first, stat.second, it->d_until});
+      result.push_back(std::make_tuple(stat.first, stat.second, it->d_until));
     }
   }
   return result;