From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 10 Sep 2024 09:32:02 +0000 (+0200)
Subject: Two more now redundant cases spotted by rgacogne
X-Git-Tag: rec-5.2.0-alpha1~90^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F14633%2Fhead;p=thirdparty%2Fpdns.git

Two more now redundant cases spotted by rgacogne
---

diff --git a/pdns/dnsname.hh b/pdns/dnsname.hh
index 0d9112b2ad..9ba8ba7fbb 100644
--- a/pdns/dnsname.hh
+++ b/pdns/dnsname.hh
@@ -34,10 +34,7 @@
 #include <string_view>
 
 #include <boost/version.hpp>
-
-#if BOOST_VERSION >= 105300
 #include <boost/container/string.hpp>
-#endif
 
 inline bool dns_isspace(char c)
 {
@@ -176,11 +173,8 @@ public:
   inline bool canonCompare(const DNSName& rhs) const;
   bool slowCanonCompare(const DNSName& rhs) const;
 
-#if BOOST_VERSION >= 105300
   typedef boost::container::string string_t;
-#else
-  typedef std::string string_t;
-#endif
+
   const string_t& getStorage() const {
     return d_storage;
   }
diff --git a/pdns/recursordist/meson.build b/pdns/recursordist/meson.build
index 1be86449c0..5158af99d5 100644
--- a/pdns/recursordist/meson.build
+++ b/pdns/recursordist/meson.build
@@ -200,8 +200,6 @@ foreach name, info: conditional_sources
   endif
 endforeach
 
-conf.set('HAVE_BOOST_CONTAINER_FLAT_SET_HPP', true)
-
 # Generate config.h
 config_h = configure_file(configuration: conf, output: 'config.h')