From 01d7beb662f906f0a046a80c1f332e1cd657bb78 Mon Sep 17 00:00:00 2001 From: bert hubert Date: Wed, 10 Apr 2019 15:44:08 +0200 Subject: [PATCH] Boost string_view only appeared in Boost 1.61, not 1.54 as we were assuming --- modules/lmdbbackend/lmdb-safe.hh | 2 +- modules/lmdbbackend/lmdbbackend.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/lmdbbackend/lmdb-safe.hh b/modules/lmdbbackend/lmdb-safe.hh index de04d3208..de5e9aef8 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 -#if BOOST_VERSION > 105400 +#if BOOST_VERSION >= 106100 #include using boost::string_view; #else diff --git a/modules/lmdbbackend/lmdbbackend.cc b/modules/lmdbbackend/lmdbbackend.cc index 58c61e5c1..ea152739c 100644 --- a/modules/lmdbbackend/lmdbbackend.cc +++ b/modules/lmdbbackend/lmdbbackend.cc @@ -224,10 +224,10 @@ std::shared_ptr 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) -- 2.40.0