From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Wed, 9 Feb 2022 16:06:44 +0000 (+0100)
Subject: Remove include boost/format.hpp from namespaces.hh and only include it where used
X-Git-Tag: auth-4.7.0-alpha1~11^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a48e03dabb26cd27797114c59b3b68fa26d7cf20;p=thirdparty%2Fpdns.git

Remove include boost/format.hpp from namespaces.hh and only include it where used
---

diff --git a/pdns/dnscrypt.cc b/pdns/dnscrypt.cc
index 74d9182cfc..3a627c8902 100644
--- a/pdns/dnscrypt.cc
+++ b/pdns/dnscrypt.cc
@@ -22,6 +22,7 @@
 #include "config.h"
 #ifdef HAVE_DNSCRYPT
 #include <fstream>
+#include <boost/format.hpp>
 #include "dolog.hh"
 #include "dnscrypt.hh"
 #include "dnswriter.hh"
diff --git a/pdns/dnspcap.hh b/pdns/dnspcap.hh
index 1689ee92ce..bdeb17676c 100644
--- a/pdns/dnspcap.hh
+++ b/pdns/dnspcap.hh
@@ -42,8 +42,7 @@
 #else
 #include <net/ethernet.h>
 #endif
-#include <vector>
-#include <boost/format.hpp>
+
 #include "namespaces.hh"
 
 struct pdns_pcap_file_header {
diff --git a/pdns/dnsrecords.cc b/pdns/dnsrecords.cc
index 5e0d5333d0..f9379e3a39 100644
--- a/pdns/dnsrecords.cc
+++ b/pdns/dnsrecords.cc
@@ -22,6 +22,9 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
+#include <boost/format.hpp>
+
 #include "utility.hh"
 #include "dnsrecords.hh"
 #include "iputils.hh"
diff --git a/pdns/dnsscope.cc b/pdns/dnsscope.cc
index 6e7e5c4955..4b16569946 100644
--- a/pdns/dnsscope.cc
+++ b/pdns/dnsscope.cc
@@ -31,6 +31,7 @@
 #include "dnspcap.hh"
 #include "dnsparser.hh"
 #include "dnsname.hh"
+#include <boost/format.hpp>
 #include <map>
 #include <set>
 #include <fstream>
diff --git a/pdns/dynlistener.cc b/pdns/dynlistener.cc
index 656538e98f..63d06bd368 100644
--- a/pdns/dynlistener.cc
+++ b/pdns/dynlistener.cc
@@ -30,6 +30,7 @@
 #include <dlfcn.h>
 #include <unistd.h>
 #include <boost/algorithm/string.hpp>
+#include <boost/format.hpp>
 
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/pdns/filterpo.cc b/pdns/filterpo.cc
index 2253d37215..de437e5dba 100644
--- a/pdns/filterpo.cc
+++ b/pdns/filterpo.cc
@@ -22,6 +22,7 @@
 
 #include <cinttypes>
 #include <iostream>
+#include <boost/format.hpp>
 
 #include "filterpo.hh"
 #include "namespaces.hh"
diff --git a/pdns/iputils.cc b/pdns/iputils.cc
index ac2f737c8d..8bc8040203 100644
--- a/pdns/iputils.cc
+++ b/pdns/iputils.cc
@@ -22,8 +22,11 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
 #include "iputils.hh"
-#include <sys/socket.h> 
+
+#include <sys/socket.h>
+#include <boost/format.hpp>
 
 #if HAVE_GETIFADDRS
 #include <ifaddrs.h>
diff --git a/pdns/minicurl.cc b/pdns/minicurl.cc
index 91b561cd01..d5981c4e41 100644
--- a/pdns/minicurl.cc
+++ b/pdns/minicurl.cc
@@ -25,6 +25,7 @@
 #include "minicurl.hh"
 #include <curl/curl.h>
 #include <stdexcept>
+#include <boost/format.hpp>
 
 void MiniCurl::init()
 {
diff --git a/pdns/misc.cc b/pdns/misc.cc
index ef02cdf14f..8a0d0565ef 100644
--- a/pdns/misc.cc
+++ b/pdns/misc.cc
@@ -51,6 +51,7 @@
 #include "pdnsexception.hh"
 #include <sys/types.h>
 #include <boost/algorithm/string.hpp>
+#include <boost/format.hpp>
 #include "iputils.hh"
 #include "dnsparser.hh"
 #include <sys/types.h>
diff --git a/pdns/namespaces.hh b/pdns/namespaces.hh
index e4e3fa6b08..5c8b4224a6 100644
--- a/pdns/namespaces.hh
+++ b/pdns/namespaces.hh
@@ -21,7 +21,6 @@
  */
 #pragma once
 
-#include <boost/format.hpp>
 #include <boost/optional.hpp>
 #include <iostream>
 #include <map>
diff --git a/pdns/rcpgenerator.cc b/pdns/rcpgenerator.cc
index 43bc488ce9..4756ea6245 100644
--- a/pdns/rcpgenerator.cc
+++ b/pdns/rcpgenerator.cc
@@ -30,6 +30,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/format.hpp>
 
 #include <iostream>
 #include "base32.hh"
diff --git a/pdns/responsestats.cc b/pdns/responsestats.cc
index 8397e6bab1..0acc334132 100644
--- a/pdns/responsestats.cc
+++ b/pdns/responsestats.cc
@@ -1,8 +1,12 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
 #include "responsestats.hh"
+
 #include <limits>
+#include <boost/format.hpp>
+
 #include "namespaces.hh"
 #include "logger.hh"
 
diff --git a/pdns/sillyrecords.cc b/pdns/sillyrecords.cc
index f6197bf17f..d1319a1a42 100644
--- a/pdns/sillyrecords.cc
+++ b/pdns/sillyrecords.cc
@@ -1,6 +1,9 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
+#include <boost/format.hpp>
+
 #include "utility.hh"
 #include <cstdio>
 #include <math.h>
diff --git a/pdns/ws-api.cc b/pdns/ws-api.cc
index 5c48fdae1a..08f3d5cbac 100644
--- a/pdns/ws-api.cc
+++ b/pdns/ws-api.cc
@@ -24,6 +24,8 @@
 #endif
 
 #include <boost/tokenizer.hpp>
+#include <boost/format.hpp>
+
 #include "namespaces.hh"
 #include "ws-api.hh"
 #include "json.hh"