From: Kees Monshouwer Date: Thu, 25 Feb 2016 19:25:02 +0000 (+0000) Subject: the boost container lib was introduced in version 1.48 X-Git-Tag: rec-4.0.0-alpha2~38^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f0fd2644c052fa5ff92cdca4a883e507655a4cb;p=pdns the boost container lib was introduced in version 1.48 --- diff --git a/pdns/dnsname.hh b/pdns/dnsname.hh index 20b7d1c6e..cd9ad2618 100644 --- a/pdns/dnsname.hh +++ b/pdns/dnsname.hh @@ -6,8 +6,10 @@ #include #include +#include + // it crashes on OSX.. -#ifndef __APPLE__ +#if BOOST_VERSION >= 104800 && ! defined( __APPLE__ ) #include #endif @@ -100,10 +102,10 @@ public: inline bool canonCompare(const DNSName& rhs) const; bool slowCanonCompare(const DNSName& rhs) const; -#ifdef __APPLE__ - typedef std::string string_t; -#else +#if BOOST_VERSION >= 104800 && ! defined( __APPLE__ ) typedef boost::container::string string_t; +#else + typedef std::string string_t; #endif private: