Remove some `boost::optional` leftovers

Signed-off-by: Remi Gacogne <remi.gacogne@powerdns.com>

diff --git a/pdns/dnspacket.hh b/pdns/dnspacket.hh
index 9e16b432c70b3350c3dfd0bbaf740fcfb4fe2db7..091b6f13e0f195515d80ba63198fa2e6e886506d 100644 (file)
--- a/pdns/dnspacket.hh
+++ b/pdns/dnspacket.hh
@@ -33,9 +33,10 @@
 #include <arpa/inet.h>
 
 #include <iostream>
-#include <optional>
 #include <string>
 #include <vector>
+#include <boost/optional.hpp>
+
 #include "qtype.hh"
 #include "dns.hh"
 #include "misc.hh"

diff --git a/pdns/dnsproxy.hh b/pdns/dnsproxy.hh
index b5ec5de136420cb6bf6347c024dea1c52b814d24..c6d4f5ecf6d032cf2732c52f0fca49c2c7727b3f 100644 (file)
--- a/pdns/dnsproxy.hh
+++ b/pdns/dnsproxy.hh
@@ -24,6 +24,8 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <boost/optional.hpp>
+
 #include "dnspacket.hh"
 #include "lock.hh"
 #include "iputils.hh"

diff --git a/pdns/ednsextendederror.hh b/pdns/ednsextendederror.hh
index 5b264fcf69b6f2985ac39d8b5ba9a01e25ff924a..7c067a0f52100dbca0dde1716ba308982c258ee5 100644 (file)
--- a/pdns/ednsextendederror.hh
+++ b/pdns/ednsextendederror.hh
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #pragma once
+#include <cstdint>
+
 #include "namespaces.hh"
 
 struct EDNSExtendedError

diff --git a/pdns/iputils.hh b/pdns/iputils.hh
index ce1c4715288a5b8a21e4ec1b32974055881beeb1..4a00906553272d77db18742a9afff96f289aec1d 100644 (file)
--- a/pdns/iputils.hh
+++ b/pdns/iputils.hh
@@ -1757,7 +1757,7 @@ public:
     tree.insert(netmask).second = positive;
   }
 
-  void addMasks(const NetmaskGroup& group, boost::optional<bool> positive)
+  void addMasks(const NetmaskGroup& group, std::optional<bool> positive)
   {
     for (const auto& entry : group.tree) {
       addMask(entry.first, positive ? *positive : entry.second);

diff --git a/pdns/logging.hh b/pdns/logging.hh
index 548859503037b39517965ba2c55a3da8f95f5a8f..8c2345306542b148166e3df9e443e9b41e6af51b 100644 (file)
--- a/pdns/logging.hh
+++ b/pdns/logging.hh
@@ -30,7 +30,6 @@
 #include <memory>
 #include <string>
 #include <sstream>
-#include <boost/optional.hpp>
 
 #include "logr.hh"
 #include "dnsname.hh"

diff --git a/pdns/logr.hh b/pdns/logr.hh
index e24141f2175a6b85de984a8f7125acfa52066ea5..dc09201906f6f2fa420c90de6f743063fc5c7768 100644 (file)
--- a/pdns/logr.hh
+++ b/pdns/logr.hh
@@ -23,6 +23,7 @@
 #pragma once
 
 #include <array>
+#include <cstdint>
 #include <string>
 #include <memory>
 #include <map>

diff --git a/pdns/namespaces.hh b/pdns/namespaces.hh
index f7489fe8591156a5069bdd1ab2a4bc7591da2f37..635e6ae380b7fdaf1d4ad2733aaaab58e3e483b7 100644 (file)
--- a/pdns/namespaces.hh
+++ b/pdns/namespaces.hh
@@ -21,7 +21,6 @@
  */
 #pragma once
 
-#include <boost/optional.hpp>
 #include <iostream>
 #include <map>
 #include <memory>

diff --git a/pdns/qtype.hh b/pdns/qtype.hh
index 1b28705a8bc82438c0f3ba4959cc8f02bc2b8d2c..4f9c633771a596755c2b1dfd7a2f626b4e6ab4cb 100644 (file)
--- a/pdns/qtype.hh
+++ b/pdns/qtype.hh
@@ -20,6 +20,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #pragma once
+
+#include <cstdint>
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

diff --git a/pdns/recursordist/negcache.hh b/pdns/recursordist/negcache.hh
index e32baa4064423f25bdd74464c266a5f09112f28a..a281e8984081d3a433d78426d0061bb8883a8094 100644 (file)
--- a/pdns/recursordist/negcache.hh
+++ b/pdns/recursordist/negcache.hh
@@ -26,7 +26,6 @@
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/sequenced_index.hpp>
 #include <boost/multi_index/key_extractors.hpp>
-#include <boost/optional.hpp>
 #include "dnsparser.hh"
 #include "dnsname.hh"
 #include "dns.hh"

diff --git a/pdns/recursordist/recpacketcache.hh b/pdns/recursordist/recpacketcache.hh
index 3d975d3f7ab2c8070e568ec627ff9bee8128bd6b..e11906ec367395c3936ae689d77ebfcfb009cf69 100644 (file)
--- a/pdns/recursordist/recpacketcache.hh
+++ b/pdns/recursordist/recpacketcache.hh
@@ -30,7 +30,6 @@
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/sequenced_index.hpp>
 #include <boost/multi_index/key_extractors.hpp>
-#include <boost/optional.hpp>
 
 #include "packetcache.hh"
 #include "validate.hh"