From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 5 Sep 2016 14:17:04 +0000 (+0200)
Subject: Use normal vectors on boost < 1.54
X-Git-Tag: dnsdist-1.1.0-beta2~127^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8cd1d8fa5153cc985fb01115fa8f923ecb566cd;p=thirdparty%2Fpdns.git

Use normal vectors on boost < 1.54
---

diff --git a/pdns/dnswriter.cc b/pdns/dnswriter.cc
index a369a8f60a..6b831f0f7d 100644
--- a/pdns/dnswriter.cc
+++ b/pdns/dnswriter.cc
@@ -22,7 +22,10 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 105400
 #include <boost/container/static_vector.hpp>
+#endif
 #include "dnswriter.hh"
 #include "misc.hh"
 #include "dnsparser.hh"
@@ -197,7 +200,11 @@ uint16_t DNSPacketWriter::lookupName(const DNSName& name, uint16_t* matchLen)
   */
   unsigned int bestpos=0;
   *matchLen=0;
+#if BOOST_VERSION >= 105400
   boost::container::static_vector<uint16_t, 34> nvect, pvect;
+#else
+  vector<uint16_t> nvect, pvect;
+#endif
 
   try {
     for(auto riter= raw.cbegin(); riter < raw.cend(); ) {