From: Pieter Lexis Date: Fri, 2 Nov 2018 09:04:34 +0000 (+0100) Subject: Fix el6 builds X-Git-Tag: auth-4.0.6~2^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9a2a1b5f3a00de6a99b34cffc23f6aa5d1fce98;p=thirdparty%2Fpdns.git Fix el6 builds Boost 1.48 does not play nice with the storage used for dnsname. --- diff --git a/pdns/dnsname.hh b/pdns/dnsname.hh index fa7f46a8d6..ae0c1ddad9 100644 --- a/pdns/dnsname.hh +++ b/pdns/dnsname.hh @@ -30,7 +30,7 @@ #include // it crashes on OSX and doesn't compile on OpenBSD -#if BOOST_VERSION >= 104800 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__) +#if BOOST_VERSION >= 105300 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__) #include #endif @@ -136,7 +136,7 @@ public: inline bool canonCompare(const DNSName& rhs) const; bool slowCanonCompare(const DNSName& rhs) const; -#if BOOST_VERSION >= 104800 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__) +#if BOOST_VERSION >= 105300 && ! defined( __APPLE__ ) && ! defined(__OpenBSD__) typedef boost::container::string string_t; #else typedef std::string string_t;