aboutsummaryrefslogtreecommitdiffstats
path: root/libqpdf/Pl_Buffer.cc
diff options
context:
space:
mode:
authorZoe Clifford <zoeclifford@google.com>2023-08-22 22:44:58 +0200
committerZoe Clifford <zoeclifford@google.com>2023-08-22 22:44:58 +0200
commitcbae2f916b8a7b4398d12632ecbc251456a75dae (patch)
treef917b85c7abe1f72a280650d3aa8afd4a73e9bd3 /libqpdf/Pl_Buffer.cc
parent5d6ee83e3f39b5ee8768e93599ec09fa66d25908 (diff)
downloadqpdf-cbae2f916b8a7b4398d12632ecbc251456a75dae.tar.zst
Remove use of non-standard `char_traits<unsigned char>` from Pl_Buffer
`basic_string<unsigned char>` implies use of `char_traits<unsigned char>`. This char_traits specialization is not standard C++, and will be removed from LibC++ as of LLVM 18. To ensure continued LibC++ compatibility it needs to be removed. There are two possible replacements here: `std::string` (e.g. `std::basic_string<char>`), or `std::vector<unsigned char>`. I have opted for vector since this code is dealing with a binary buffer; though probably either way is fine (why does C++ even have strings anyway??). https://github.com/qpdf/qpdf/issues/1024
Diffstat (limited to 'libqpdf/Pl_Buffer.cc')
-rw-r--r--libqpdf/Pl_Buffer.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/libqpdf/Pl_Buffer.cc b/libqpdf/Pl_Buffer.cc
index b10cf544..766c04b5 100644
--- a/libqpdf/Pl_Buffer.cc
+++ b/libqpdf/Pl_Buffer.cc
@@ -19,7 +19,7 @@ Pl_Buffer::~Pl_Buffer() // NOLINT (modernize-use-equals-default)
void
Pl_Buffer::write(unsigned char const* buf, size_t len)
{
- m->data.append(buf, len);
+ m->data.insert(m->data.end(), buf, buf + len);
m->ready = false;
if (getNext(true)) {
@@ -43,7 +43,7 @@ Pl_Buffer::getBuffer()
throw std::logic_error("Pl_Buffer::getBuffer() called when not ready");
}
- auto size = m->data.length();
+ auto size = m->data.size();
auto* b = new Buffer(size);
if (size > 0) {
unsigned char* p = b->getBuffer();
@@ -65,7 +65,7 @@ Pl_Buffer::getMallocBuffer(unsigned char** buf, size_t* len)
if (!m->ready) {
throw std::logic_error("Pl_Buffer::getMallocBuffer() called when not ready");
}
- auto size = m->data.length();
+ auto size = m->data.size();
*len = size;
if (size > 0) {
*buf = reinterpret_cast<unsigned char*>(malloc(size));