From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 5 Dec 2025 14:49:14 +0000 (+0100)
Subject: Remove some `boost::optional` leftovers
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54c23c48a41f72d775424be8d11cca8dc3b3f5c6;p=thirdparty%2Fpdns.git

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 9e16b432c7..091b6f13e0 100644
--- 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 b5ec5de136..c6d4f5ecf6 100644
--- 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 5b264fcf69..7c067a0f52 100644
--- 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 ce1c471528..4a00906553 100644
--- 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 5488595030..8c23453065 100644
--- 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 e24141f217..dc09201906 100644
--- 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 f7489fe859..635e6ae380 100644
--- 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 1b28705a8b..4f9c633771 100644
--- 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 e32baa4064..a281e89840 100644
--- 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 3d975d3f7a..e11906ec36 100644
--- 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"