From c9b3a30803da1584b0d9244b80b3195b3ea4ba16 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Tue, 10 Sep 2024 11:32:02 +0200 Subject: [PATCH] Two more now redundant cases spotted by rgacogne --- pdns/dnsname.hh | 8 +------- pdns/recursordist/meson.build | 2 -- 2 files changed, 1 insertion(+), 9 deletions(-) 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 #include - -#if BOOST_VERSION >= 105300 #include -#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') -- 2.47.2