From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 26 Aug 2016 18:41:19 +0000 (+0200)
Subject: moving some include files to prevent clashes of #defines on OSX
X-Git-Tag: dnsdist-1.1.0-beta2~166^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c0139b0854b6a89882b0bfc54f7e7bea42c0086;p=thirdparty%2Fpdns.git

moving some include files to prevent clashes of #defines on OSX
---

diff --git a/pdns/dnswriter.cc b/pdns/dnswriter.cc
index 763bc2eb99..ff628d76bd 100644
--- a/pdns/dnswriter.cc
+++ b/pdns/dnswriter.cc
@@ -22,11 +22,11 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include <boost/container/static_vector.hpp>
 #include "dnswriter.hh"
 #include "misc.hh"
 #include "dnsparser.hh"
-#include <boost/container/static_vector.hpp>
-#include <boost/scoped_ptr.hpp>
+
 #include <limits.h>
 
 DNSPacketWriter::DNSPacketWriter(vector<uint8_t>& content, const DNSName& qname, uint16_t  qtype, uint16_t qclass, uint8_t opcode)
diff --git a/pdns/speedtest.cc b/pdns/speedtest.cc
index f18a7a89c3..465f2c3024 100644
--- a/pdns/speedtest.cc
+++ b/pdns/speedtest.cc
@@ -1,17 +1,19 @@
 #include "config.h"
+#include <boost/format.hpp>
+#include <boost/container/string.hpp>
 #include "dnsparser.hh"
 #include "sstuff.hh"
 #include "misc.hh"
 #include "dnswriter.hh"
 #include "dnsrecords.hh"
 #include <fstream>
-#include <boost/format.hpp>
+
 #ifndef RECURSOR
 #include "statbag.hh"
 #include "base64.hh"
 StatBag S;
 #endif
-#include <boost/container/string.hpp>
+
 volatile bool g_ret; // make sure the optimizer does not get too smart
 uint64_t g_totalRuns;
 volatile bool g_stop;