From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Tue, 31 Jan 2023 08:52:44 +0000 (+0100)
Subject: Fix a collision between #12417 and #11511
X-Git-Tag: dnsdist-1.8.0-rc1~65^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F12490%2Fhead;p=thirdparty%2Fpdns.git

Fix a collision between #12417 and #11511

I removed the pdns_string_view alias in #12417 as it was no longer
used, but merging #11511 actually reintroduced it, breaking the build.
---

diff --git a/pdns/dnsparser.cc b/pdns/dnsparser.cc
index 4d0649c2e0..3860493eb7 100644
--- a/pdns/dnsparser.cc
+++ b/pdns/dnsparser.cc
@@ -116,7 +116,7 @@ shared_ptr<DNSRecordContent> DNSRecordContent::deserialize(const DNSName& qname,
   dr.d_type = qtype;
   dr.d_name = qname;
   dr.d_clen = serialized.size();
-  PacketReader pr(pdns_string_view(reinterpret_cast<const char*>(packet.data()), packet.size()), packet.size() - serialized.size() - sizeof(dnsrecordheader));
+  PacketReader pr(std::string_view(reinterpret_cast<const char*>(packet.data()), packet.size()), packet.size() - serialized.size() - sizeof(dnsrecordheader));
   /* needed to get the record boundaries right */
   pr.getDnsrecordheader(drh);
   auto content = DNSRecordContent::mastermake(dr, pr, Opcode::Query);