From e2134021a411e44e808883b092f37205c69a24ea Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Tue, 31 Jan 2023 09:52:44 +0100 Subject: [PATCH] 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. --- pdns/dnsparser.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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::deserialize(const DNSName& qname, dr.d_type = qtype; dr.d_name = qname; dr.d_clen = serialized.size(); - PacketReader pr(pdns_string_view(reinterpret_cast(packet.data()), packet.size()), packet.size() - serialized.size() - sizeof(dnsrecordheader)); + PacketReader pr(std::string_view(reinterpret_cast(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); -- 2.47.2