Two more now redundant cases spotted by rgacogne

diff --git a/pdns/dnsname.hh b/pdns/dnsname.hh
index 0d9112b2ad2183649e5180be48d69edc8a0d6417..9ba8ba7fbb7401dd1155cac39a0e42427538ab03 100644 (file)
--- 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 1be86449c0f64159ba58cb41c25f477ccb889b77..5158af99d5ec54395156392da2d20339ea739762 100644 (file)
--- 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')