From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 10 Apr 2019 13:44:08 +0000 (+0200)
Subject: Boost string_view only appeared in Boost 1.61, not 1.54 as we were assuming
X-Git-Tag: dnsdist-1.4.0-alpha2~23^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01d7beb662f906f0a046a80c1f332e1cd657bb78;p=thirdparty%2Fpdns.git

Boost string_view only appeared in Boost 1.61, not 1.54 as we were assuming
---

diff --git a/modules/lmdbbackend/lmdb-safe.hh b/modules/lmdbbackend/lmdb-safe.hh
index de04d32085..de5e9aef85 100644
--- a/modules/lmdbbackend/lmdb-safe.hh
+++ b/modules/lmdbbackend/lmdb-safe.hh
@@ -13,7 +13,7 @@
 // apple compiler somehow has string_view even in c++11!
 #if __cplusplus < 201703L && !defined(__APPLE__)
 #include <boost/version.hpp>
-#if BOOST_VERSION > 105400
+#if BOOST_VERSION >= 106100
 #include <boost/utility/string_view.hpp>
 using boost::string_view;
 #else
diff --git a/modules/lmdbbackend/lmdbbackend.cc b/modules/lmdbbackend/lmdbbackend.cc
index 58c61e5c17..ea152739ca 100644
--- a/modules/lmdbbackend/lmdbbackend.cc
+++ b/modules/lmdbbackend/lmdbbackend.cc
@@ -224,10 +224,10 @@ std::shared_ptr<DNSRecordContent> unserializeContentZR(uint16_t qtype, const DNS
    Note - domain_id, name and type are ONLY present on the index!
 */
 
-#if BOOST_VERSION <= 105400
-#define StringView string
-#else
+#if BOOST_VERSION >= 106100
 #define StringView string_view
+#else
+#define StringView string
 #endif
 
 void LMDBBackend::deleteDomainRecords(RecordsRWTransaction& txn, uint32_t domain_id, uint16_t qtype)