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

diff --git a/pdns/dnswriter.cc b/pdns/dnswriter.cc
index 763bc2eb99637cd0785799d5843743e6e2dcc2b7..ff628d76bd36de8f13daaf0781971cc5eeb01199 100644 (file)
--- 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 f18a7a89c33e41fc4a2059c4f35144946c08f3e2..465f2c30246d40a5b8fe0ee3b0562bffca7c797f 100644 (file)
--- 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;