From b6ecb5b28053bd99ed50196ac0a9315df7dd2eaf Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Thu, 19 Nov 2020 14:24:01 +0100 Subject: [PATCH] rec: Fix getEDNSExtendedErrorOptFromString() on CentOS 6 pdns_string_view falls back to a regular string there, so there was an ambiguity on which overloaded function to call. --- pdns/recursordist/ednsextendederror.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pdns/recursordist/ednsextendederror.cc b/pdns/recursordist/ednsextendederror.cc index 9903a0770f..cf611d0016 100644 --- a/pdns/recursordist/ednsextendederror.cc +++ b/pdns/recursordist/ednsextendederror.cc @@ -22,7 +22,7 @@ #include "ednsextendederror.hh" #include "views.hh" -static bool getEDNSExtendedErrorOptFromString(const pdns_string_view option, EDNSExtendedError& eee) +static bool getEDNSExtendedErrorOptFromStringView(const pdns_string_view& option, EDNSExtendedError& eee) { if (option.size() < sizeof(uint16_t)) { return false; @@ -38,12 +38,12 @@ static bool getEDNSExtendedErrorOptFromString(const pdns_string_view option, EDN bool getEDNSExtendedErrorOptFromString(const string& option, EDNSExtendedError& eee) { - return getEDNSExtendedErrorOptFromString(pdns_string_view(option), eee); + return getEDNSExtendedErrorOptFromStringView(pdns_string_view(option), eee); } bool getEDNSExtendedErrorOptFromString(const char* option, unsigned int len, EDNSExtendedError& eee) { - return getEDNSExtendedErrorOptFromString(pdns_string_view(option, len), eee); + return getEDNSExtendedErrorOptFromStringView(pdns_string_view(option, len), eee); } string makeEDNSExtendedErrorOptString(const EDNSExtendedError& eee) -- 2.47.2