From 1db283e926bd60f70e73b5a6cf9291cc08052182 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Tue, 5 Jan 2021 14:07:22 +0100 Subject: [PATCH] MacOS (both Intel and arm64) and OpenBSD have no issues any more with boost::containter::string --- pdns/dnsname.hh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pdns/dnsname.hh b/pdns/dnsname.hh index ab1bb8680e..10a4f0d2b1 100644 --- a/pdns/dnsname.hh +++ b/pdns/dnsname.hh @@ -33,8 +33,7 @@ #include -// it crashes on OSX and doesn't compile on OpenBSD -#if BOOST_VERSION >= 105300 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__) +#if BOOST_VERSION >= 105300 #include #endif @@ -158,7 +157,7 @@ public: inline bool canonCompare(const DNSName& rhs) const; bool slowCanonCompare(const DNSName& rhs) const; -#if BOOST_VERSION >= 105300 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__) +#if BOOST_VERSION >= 105300 typedef boost::container::string string_t; #else typedef std::string string_t; -- 2.47.2