From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Thu, 10 May 2018 11:42:44 +0000 (+0200)
Subject: reorder includes to avoid Boost L conflict
X-Git-Tag: rec-4.1.3~2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6595%2Fhead;p=thirdparty%2Fpdns.git

reorder includes to avoid Boost L conflict
---

diff --git a/pdns/lua-recursor4.cc b/pdns/lua-recursor4.cc
index a2cc8e0338..3ea797700a 100644
--- a/pdns/lua-recursor4.cc
+++ b/pdns/lua-recursor4.cc
@@ -19,11 +19,9 @@
  * 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"
@@ -31,6 +29,7 @@
 #include "filterpo.hh"
 #include "rec-snmp.hh"
 #include <unordered_set>
+#include "lua-recursor4.hh"
 
 static int followCNAMERecords(vector<DNSRecord>& ret, const QType& qtype)
 {
diff --git a/pdns/lwres.cc b/pdns/lwres.cc
index 6c045a8b9e..270f52c65b 100644
--- 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 1371ea605a..2cd1f3b00a 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -27,9 +27,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 3c9b49a0b3..5b53f20800 100644
--- 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 0fab8fa3ac..9c3785151f 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/rec-carbon.cc b/pdns/rec-carbon.cc
index 5cf085ba9e..f8098edc74 100644
--- 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 671d6e2ea0..50dea49749 100644
--- a/pdns/rec-lua-conf.cc
+++ b/pdns/rec-lua-conf.cc
@@ -4,11 +4,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 7daaa998a0..5d495dbdb7 100644
--- 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>
@@ -10,7 +11,6 @@
 #endif
 #include "misc.hh"
 #include "recursor_cache.hh"
-#include "syncres.hh"
 #include "negcache.hh"
 #include <boost/function.hpp>
 #include <boost/optional.hpp>
diff --git a/pdns/recpacketcache.hh b/pdns/recpacketcache.hh
index bfa16961f2..8263c73f5e 100644
--- 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>
@@ -35,10 +41,6 @@
 
 #include "packetcache.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include "rec-protobuf.hh"
 
 
 using namespace ::boost::multi_index;
diff --git a/pdns/recursor_cache.cc b/pdns/recursor_cache.cc
index 1193afe6b9..9ccecf8c59 100644
--- 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 7db92cb845..bfc91a4c0a 100644
--- a/pdns/rpzloader.cc
+++ b/pdns/rpzloader.cc
@@ -1,7 +1,7 @@
+#include "syncres.hh"
 #include "dnsparser.hh"
 #include "dnsrecords.hh"
 #include "ixfr.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 d7d46a0a09..a0337a9192 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -23,6 +23,7 @@
 #include "config.h"
 #endif
 
+#include "syncres.hh"
 #include "arguments.hh"
 #include "cachecleaner.hh"
 #include "dns_random.hh"
@@ -32,7 +33,6 @@
 #include "logger.hh"
 #include "lua-recursor4.hh"
 #include "rec-lua-conf.hh"
-#include "syncres.hh"
 #include "dnsseckeeper.hh"
 #include "validate-recursor.hh"
 
diff --git a/pdns/syncres.hh b/pdns/syncres.hh
index 33dae04805..52325a45f1 100644
--- a/pdns/syncres.hh
+++ b/pdns/syncres.hh
@@ -20,6 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #pragma once
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_PROTOBUF
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/uuid_generators.hpp>
+#endif
+
 #include <string>
 #include <atomic>
 #include "utility.hh"
@@ -50,15 +60,6 @@
 #include "filterpo.hh"
 #include "negcache.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef HAVE_PROTOBUF
-#include <boost/uuid/uuid.hpp>
-#include <boost/uuid/uuid_generators.hpp>
-#endif
-
 class RecursorLua4;
 
 typedef map<
diff --git a/pdns/validate-recursor.cc b/pdns/validate-recursor.cc
index 83e383328b..a870c2e8aa 100644
--- 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 7b2c9bc85c..6f56a4039d 100644
--- 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"