mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00
Code Issues Releases Activity

net/kea: update patch for building with libc++ 19

Browse Source 
In https://gitlab.isc.org/isc-projects/kea/-/merge_requests/2410,
Francis Dupont noted there were some errors in the unit tests.

These were due to mistakes on my side, so I now made sure all the unit
tests pass (they silently require GoogleTest!), and updated the upstream
merge request. I hope this goes in soon, but it all seems to take a long
time.

PR:		281124
Approved by:	apevnev@me.com (maintainer)
MFH:		2024Q3
This commit is contained in:
Dimitry Andric 2024-08-29 10:44:30 +02:00
parent 4453cf7eef
commit f3bf83db98
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/kea/files/patch-src_lib_dns_name.cc
View File

@ -23,7 +23,7 @@
// the origin's data
ndata_.erase(ndata_.end() - 1);
- ndata_.append(origin->ndata_);
+ ndata_.insert(ndata.end(), origin->ndata_.begin(), origin->ndata_.end());
+ ndata_.insert(ndata_.end(), origin->ndata_.begin(), origin->ndata_.end());
// Do a similar thing with offsets. However, we need to move them
// so they point after the prefix we parsed before.
@ -45,12 +45,13 @@
retname.offsets_.push_back(retname.ndata_.size());
++rit0;
++rit1;
@@ -662,7 +662,7 @@ Name::split(const unsigned int first, const unsigned i
@@ -662,7 +662,8 @@ Name::split(const unsigned int first, const unsigned i
// original name, and append the trailing dot explicitly.
//
retname.ndata_.reserve(retname.offsets_.back() + 1);
- retname.ndata_.assign(ndata_, offsets_[first], retname.offsets_.back());
+ retname.ndata_.assign(ndata_.data() + offsets_[first], ndata_.data() + retname.offsets_.back());
+ auto it = ndata_.data() + offsets_[first];
+ retname.ndata_.assign(it, it + retname.offsets_.back());
retname.ndata_.push_back(0);
retname.length_ = retname.ndata_.size();