From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 10 Oct 2018 16:01:48 +0000 (+0200)
Subject: auth: Move includes around to avoid a 'L' conflict with newer boost
X-Git-Tag: auth-4.0.6~4^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9deec8952c6d9c6c9bdea5013357d81b2065999d;p=thirdparty%2Fpdns.git

auth: Move includes around to avoid a 'L' conflict with newer boost
---

diff --git a/pdns/protobuf.hh b/pdns/protobuf.hh
index 4b972a5f75..b0cc931d8a 100644
--- a/pdns/protobuf.hh
+++ b/pdns/protobuf.hh
@@ -26,15 +26,15 @@
 
 #include "config.h"
 
-#include "dnsname.hh"
-#include "iputils.hh"
-
 #ifdef HAVE_PROTOBUF
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_generators.hpp>
 #include "dnsmessage.pb.h"
 #endif /* HAVE_PROTOBUF */
 
+#include "dnsname.hh"
+#include "iputils.hh"
+
 class DNSProtoBufMessage
 {
 public:
diff --git a/pdns/recpacketcache.hh b/pdns/recpacketcache.hh
index 65a6baad9e..934c859e22 100644
--- a/pdns/recpacketcache.hh
+++ b/pdns/recpacketcache.hh
@@ -24,8 +24,6 @@
 #include <string>
 #include <set>
 #include <inttypes.h>
-#include "dns.hh"
-#include "namespaces.hh"
 #include <iostream>
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/ordered_index.hpp>
@@ -38,6 +36,8 @@
 #endif
 #include "rec-protobuf.hh"
 
+#include "dns.hh"
+#include "namespaces.hh"
 
 using namespace ::boost::multi_index;
 
diff --git a/pdns/test-recpacketcache_cc.cc b/pdns/test-recpacketcache_cc.cc
index 8d723253b0..00cd9739db 100644
--- a/pdns/test-recpacketcache_cc.cc
+++ b/pdns/test-recpacketcache_cc.cc
@@ -5,12 +5,14 @@
 #include "config.h"
 #endif
 #include <boost/test/unit_test.hpp>
+
+#include "recpacketcache.hh"
+
 #include "dnswriter.hh"
 #include "dnsrecords.hh"
 #include "dns_random.hh"
 #include "iputils.hh"
-#include "recpacketcache.hh"
-#include <utility>
+#include "utility.hh"
 
 
 BOOST_AUTO_TEST_SUITE(recpacketcache_cc)