Skip to content

Commit

Permalink
Merge pull request #7135 from pieterlexis/auth-40-el6-boost-build-fix
Browse files Browse the repository at this point in the history
Fix el6 builds
  • Loading branch information
pieterlexis committed Nov 2, 2018
2 parents 57931a5 + e9a2a1b commit d5859da
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pdns/dnsname.hh
Expand Up @@ -30,7 +30,7 @@
#include <boost/version.hpp>

// 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 <boost/container/string.hpp>
#endif

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit d5859da

Please sign in to comment.