move boost multi-index code around a bit to prevent namespace conflicts (#undef L)

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@1273 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/dns.hh b/pdns/dns.hh
index 7b8f192420fed4c62d4798b304c7eb89ffbd1857..99bb5a9d1c3a147a7eec6dcbf764425d1f064e61 100644 (file)
--- a/pdns/dns.hh
+++ b/pdns/dns.hh
@@ -20,7 +20,11 @@
 /* (C) 2002 POWERDNS.COM BV */
 #ifndef DNS_HH
 #define DNS_HH
-
+#include <boost/multi_index_container.hpp>
+#include <boost/multi_index/ordered_index.hpp>
+#include <boost/tuple/tuple_comparison.hpp>
+#include <boost/multi_index/key_extractors.hpp>
+#include <boost/multi_index/sequenced_index.hpp>
 #include "utility.hh"
 #include "qtype.hh"
 #include <time.h>

diff --git a/pdns/packetcache.hh b/pdns/packetcache.hh
index d7f7184efbbb7e914303c293b9e3be5431e9180a..d8f82478a9468a340c98b11c7903a3c7cb80fb96 100644 (file)
--- a/pdns/packetcache.hh
+++ b/pdns/packetcache.hh
@@ -23,12 +23,7 @@
 #include <utility>
 #include <map>
 #include <map>
-
-#include <boost/multi_index_container.hpp>
-#include <boost/multi_index/ordered_index.hpp>
-#include <boost/tuple/tuple_comparison.hpp>
-#include <boost/multi_index/key_extractors.hpp>
-#include <boost/multi_index/sequenced_index.hpp>
+#include "dns.hh"
 #include <boost/version.hpp>
 using namespace std;
 using namespace ::boost::multi_index;