]> granicus.if.org Git - pdns/commitdiff
the boost container lib was introduced in version 1.48
authorKees Monshouwer <mind04@monshouwer.org>
Thu, 25 Feb 2016 19:25:02 +0000 (19:25 +0000)
committermind04 <mind04@monshouwer.org>
Thu, 25 Feb 2016 19:25:02 +0000 (19:25 +0000)
pdns/dnsname.hh

index 20b7d1c6e5b5d945933b3dbf906cde9267993f2c..cd9ad2618d26500226df6721af7bcc7657e504a9 100644 (file)
@@ -6,8 +6,10 @@
 #include <strings.h>
 #include <stdexcept>
 
+#include <boost/version.hpp>
+
 // it crashes on OSX..
-#ifndef __APPLE__
+#if BOOST_VERSION >= 104800 && ! defined( __APPLE__ )
 #include <boost/container/string.hpp>
 #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: