reorder includes to avoid Boost L conflict

(cherry picked from commit dad05827243a837acbe29d68b6f5a68f47f5889f)

diff --git a/pdns/epollmplexer.cc b/pdns/epollmplexer.cc
index 6aca8cba6c4f36850166b70a87922088a4ed52bf..de833fe06ffaf0f21c5b535abc398657c67dd1ea 100644 (file)
--- a/pdns/epollmplexer.cc
+++ b/pdns/epollmplexer.cc
@@ -23,16 +23,15 @@
 #include "config.h"
 #endif
 #include "mplexer.hh"
+#include "syncres.hh"
 #include "sstuff.hh"
 #include <iostream>
 #include <unistd.h>
 #include "misc.hh"
-#include "syncres.hh"
 #ifdef __linux__
 #include <sys/epoll.h>
 #endif
 
-#include "namespaces.hh"
 #include "namespaces.hh"
 
 class EpollFDMultiplexer : public FDMultiplexer

diff --git a/pdns/lua-recursor4.cc b/pdns/lua-recursor4.cc
index c73951a585f7c424a97daeac6923293a509fc94e..b18c36e9bb022dab52343f777806f6c7de739918 100644 (file)
--- a/pdns/lua-recursor4.cc
+++ b/pdns/lua-recursor4.cc
@@ -19,17 +19,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-#include "lua-recursor4.hh"
 #include <fstream>
-#include "logger.hh"
-#include "dnsparser.hh"
 #include "syncres.hh"
+#include "logger.hh"
 #include "namespaces.hh"
 #include "rec_channel.hh"
 #include "ednsoptions.hh"
 #include "ednssubnet.hh"
 #include "filterpo.hh"
 #include <unordered_set>
+#include "lua-recursor4.hh"
 
 #if !defined(HAVE_LUA)
 RecursorLua4::RecursorLua4(const std::string &fname)

diff --git a/pdns/lwres.cc b/pdns/lwres.cc
index 516f92d99b84e32f98df34a2e73fa26e7dbd3478..11b3876cdcfd30e72ed9c8b5f264e448942fdb71 100644 (file)
--- a/pdns/lwres.cc
+++ b/pdns/lwres.cc
@@ -22,6 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include "syncres.hh"
 #include "utility.hh"
 #include "lwres.hh"
 #include <iostream>
@@ -38,7 +39,6 @@
 #include "pdnsexception.hh"
 #include "arguments.hh"
 #include "sstuff.hh"
-#include "syncres.hh"
 #include "dnswriter.hh"
 #include "dnsparser.hh"
 #include "logger.hh"

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index dbc1a9b53b91dbbaab0199aa5ed85a3e3ec70be7..8d33a8b658a92e3fadf2cf6d016e073e2aa241a9 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -28,9 +28,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "recpacketcache.hh"
 #include "ws-recursor.hh"
 #include <pthread.h>
-#include "recpacketcache.hh"
 #include "utility.hh"
 #include "dns_random.hh"
 #ifdef HAVE_LIBSODIUM

diff --git a/pdns/protobuf.cc b/pdns/protobuf.cc
index 523b526cc26e5c4833c470ba3a54e8416f3ec905..0a3b70f9ec740e985f1a44df9bfb604d948c76d7 100644 (file)
--- a/pdns/protobuf.cc
+++ b/pdns/protobuf.cc
@@ -1,7 +1,7 @@
 
+#include "protobuf.hh"
 #include "gettime.hh"
 #include "dnsparser.hh"
-#include "protobuf.hh"
 #include "dnsparser.hh"
 #include "gettime.hh"
 

diff --git a/pdns/protobuf.hh b/pdns/protobuf.hh
index b9aeaf5c9b3ea5137d8ac8127d6bb62881174a5b..c33155016d44f6d7f1681adea8b0ab14a984ce9d 100644 (file)
--- 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/rec-carbon.cc b/pdns/rec-carbon.cc
index 7da9a788ee54a59d91fd111d0ff1cec52eae8bf9..6c1cdff7c64d09678c3ed0f33956e91068f58a38 100644 (file)
--- a/pdns/rec-carbon.cc
+++ b/pdns/rec-carbon.cc
@@ -1,8 +1,8 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-#include "mtasker.hh"
 #include "syncres.hh"
+#include "mtasker.hh"
 #include "rec_channel.hh"
 #include "iputils.hh"
 #include "logger.hh"

diff --git a/pdns/rec-lua-conf.cc b/pdns/rec-lua-conf.cc
index 4e84686483faf096b95509d3d7e609f5bdba0b21..dd53f10736c4bce7b9221dcf5ed3ecf4d2cf4a8d 100644 (file)
--- a/pdns/rec-lua-conf.cc
+++ b/pdns/rec-lua-conf.cc
@@ -6,11 +6,11 @@
 #include <fstream>
 #include <thread>
 #include "namespaces.hh"
+#include "syncres.hh"
 #include "logger.hh"
 #include "rec-lua-conf.hh"
 #include "sortlist.hh"
 #include "filterpo.hh"
-#include "syncres.hh"
 #include "rpzloader.hh"
 #include "base64.hh"
 #include "remote_logger.hh"

diff --git a/pdns/rec_channel_rec.cc b/pdns/rec_channel_rec.cc
index b6315263ba3ad3b0e56e7d17e507f9b9d3529faf..f9b0417480f62e7eb324218a30100c9fed66a26c 100644 (file)
--- a/pdns/rec_channel_rec.cc
+++ b/pdns/rec_channel_rec.cc
@@ -1,6 +1,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include "syncres.hh"
 #include "utility.hh"
 #include "rec_channel.hh"
 #include <boost/bind.hpp>

diff --git a/pdns/recpacketcache.hh b/pdns/recpacketcache.hh
index 65a6baad9e1cd1ddd7aeeff6161d87944898b365..07af0c5d5fd623656a9a605e9f603bfa7920ed51 100644 (file)
--- a/pdns/recpacketcache.hh
+++ b/pdns/recpacketcache.hh
@@ -21,6 +21,12 @@
  */
 #ifndef PDNS_RECPACKETCACHE_HH
 #define PDNS_RECPACKETCACHE_HH
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "rec-protobuf.hh"
+
 #include <string>
 #include <set>
 #include <inttypes.h>
@@ -33,12 +39,6 @@
 #include <boost/tuple/tuple_comparison.hpp>
 #include <boost/multi_index/sequenced_index.hpp>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include "rec-protobuf.hh"
-
-
 using namespace ::boost::multi_index;
 
 //! Stores whole packets, ready for lobbing back at the client. Not threadsafe.

diff --git a/pdns/recursor_cache.cc b/pdns/recursor_cache.cc
index e987b74c016f232796a4d20d7adb671cf4d6c777..a9edff475f6461928c2118fb8aa71f85ad13c731 100644 (file)
--- a/pdns/recursor_cache.cc
+++ b/pdns/recursor_cache.cc
@@ -4,12 +4,12 @@
 
 #include <cinttypes>
 
+#include "syncres.hh"
 #include "recursor_cache.hh"
 #include "misc.hh"
 #include <iostream>
 #include "dnsrecords.hh"
 #include "arguments.hh"
-#include "syncres.hh"
 #include "recursor_cache.hh"
 #include "cachecleaner.hh"
 #include "namespaces.hh"

diff --git a/pdns/rpzloader.cc b/pdns/rpzloader.cc
index bfee4685e09960001892a64599cee89a4c338584..1a1df65abf78c99c747c3ac0c46cae3998e06900 100644 (file)
--- a/pdns/rpzloader.cc
+++ b/pdns/rpzloader.cc
@@ -1,8 +1,8 @@
+#include "syncres.hh"
 #include "rpzloader.hh"
 #include "zoneparser-tng.hh"
 #include "dnsparser.hh"
 #include "dnsrecords.hh"
-#include "syncres.hh"
 #include "resolver.hh"
 #include "logger.hh"
 #include "rec-lua-conf.hh"

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 3f1cb68d16b30e0af2b88c6d2b9b2b0d2cee2bb4..55ce1a71145f83cd5a46434fc3909fdcceccb605 100644 (file)
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -25,9 +25,9 @@
 #endif
 #include <boost/algorithm/string.hpp>
 
+#include "syncres.hh"
 #include "lua-recursor4.hh"
 #include "utility.hh"
-#include "syncres.hh"
 #include <iostream>
 #include <map>
 #include "dnsrecords.hh"

diff --git a/pdns/syncres.hh b/pdns/syncres.hh
index 838694c612c012b9d43cb9eb4f148cd5237d37d3..3ceec347202cf0e218f0b8b91e6de756efd00402 100644 (file)
--- a/pdns/syncres.hh
+++ b/pdns/syncres.hh
@@ -21,6 +21,13 @@
  */
 #ifndef PDNS_SYNCRES_HH
 #define PDNS_SYNCRES_HH
+
+#include "config.h"
+#ifdef HAVE_PROTOBUF
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/uuid_generators.hpp>
+#endif
+
 #include <string>
 #include <atomic>
 #include "utility.hh"
@@ -50,12 +57,6 @@
 #include "ednssubnet.hh"
 #include "filterpo.hh"
 
-#include "config.h"
-#ifdef HAVE_PROTOBUF
-#include <boost/uuid/uuid.hpp>
-#include <boost/uuid/uuid_generators.hpp>
-#endif
-
 void primeHints(void);
 int getRootNS(void);
 class RecursorLua4;

diff --git a/pdns/test-recpacketcache_cc.cc b/pdns/test-recpacketcache_cc.cc
index 8d723253b0f8bebd688e16bf0313705b906cc922..f6cd9bb2cea4f7124c731a87bfe17b9199c720d4 100644 (file)
--- a/pdns/test-recpacketcache_cc.cc
+++ b/pdns/test-recpacketcache_cc.cc
@@ -5,11 +5,11 @@
 #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>
 
 

diff --git a/pdns/validate-recursor.cc b/pdns/validate-recursor.cc
index 1aca8cfc02a4e0820781fea8f2b7854e246d2743..5d749935d0b04a0166e70246eedece19a50f8377 100644 (file)
--- a/pdns/validate-recursor.cc
+++ b/pdns/validate-recursor.cc
@@ -1,6 +1,6 @@
+#include "syncres.hh"
 #include "validate.hh"
 #include "validate-recursor.hh"
-#include "syncres.hh"
 #include "logger.hh"
 
 DNSSECMode g_dnssecmode{DNSSECMode::ProcessNoValidate};

diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc
index 84e06c0aa3aa38d71e8ca62fcab902b3e944ecb1..c3211ed5003de6406864d951b5a6f08940c7ef7e 100644 (file)
--- a/pdns/ws-recursor.cc
+++ b/pdns/ws-recursor.cc
@@ -22,6 +22,7 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+#include "syncres.hh"
 #include "ws-recursor.hh"
 #include "json.hh"
 
@@ -32,7 +33,6 @@
 #include "rec_channel.hh"
 #include "arguments.hh"
 #include "misc.hh"
-#include "syncres.hh"
 #include "dnsparser.hh"
 #include "json11.hpp"
 #include "webserver.hh"