]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Fix a collision between #12417 and #11511 12490/head
authorRemi Gacogne <remi.gacogne@powerdns.com>
Tue, 31 Jan 2023 08:52:44 +0000 (09:52 +0100)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Tue, 31 Jan 2023 08:52:44 +0000 (09:52 +0100)
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

index 4d0649c2e0726b314fa8571bb98b82bed28ee5ec..3860493eb77428c4906423308eb1f0701c39c95c 100644 (file)
@@ -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);