From a68703b07e928be0eeb909c0e777e13e88cbf86d Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sat, 9 Apr 2022 14:35:56 -0400
Subject: Replace PointerHolder with std::shared_ptr in library sources only

(patrepl and cleanpatch are my own utilities)

patrepl s/PointerHolder/std::shared_ptr/g {include,libqpdf}/qpdf/*.hh
patrepl s/PointerHolder/std::shared_ptr/g libqpdf/*.cc
patrepl s/make_pointer_holder/std::make_shared/g libqpdf/*.cc
patrepl s/make_array_pointer_holder/QUtil::make_shared_array/g libqpdf/*.cc
patrepl s,qpdf/std::shared_ptr,qpdf/PointerHolder, **/*.cc **/*.hh
git restore include/qpdf/PointerHolder.hh
cleanpatch
./format-code
---
 libqpdf/Pl_Buffer.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'libqpdf/Pl_Buffer.cc')

diff --git a/libqpdf/Pl_Buffer.cc b/libqpdf/Pl_Buffer.cc
index dba91e0f..a65a97f5 100644
--- a/libqpdf/Pl_Buffer.cc
+++ b/libqpdf/Pl_Buffer.cc
@@ -30,13 +30,13 @@ void
 Pl_Buffer::write(unsigned char* buf, size_t len)
 {
     if (this->m->data.get() == 0) {
-        this->m->data = make_pointer_holder<Buffer>(len);
+        this->m->data = std::make_shared<Buffer>(len);
     }
     size_t cur_size = this->m->data->getSize();
     size_t left = cur_size - this->m->total_size;
     if (left < len) {
         size_t new_size = std::max(this->m->total_size + len, 2 * cur_size);
-        auto b = make_pointer_holder<Buffer>(new_size);
+        auto b = std::make_shared<Buffer>(new_size);
         memcpy(b->getBuffer(), this->m->data->getBuffer(), this->m->total_size);
         this->m->data = b;
     }
@@ -72,14 +72,14 @@ Pl_Buffer::getBuffer()
         unsigned char* p = b->getBuffer();
         memcpy(p, this->m->data->getBuffer(), this->m->total_size);
     }
-    this->m = PointerHolder<Members>(new Members());
+    this->m = std::shared_ptr<Members>(new Members());
     return b;
 }
 
-PointerHolder<Buffer>
+std::shared_ptr<Buffer>
 Pl_Buffer::getBufferSharedPointer()
 {
-    return PointerHolder<Buffer>(getBuffer());
+    return std::shared_ptr<Buffer>(getBuffer());
 }
 
 void
@@ -97,5 +97,5 @@ Pl_Buffer::getMallocBuffer(unsigned char** buf, size_t* len)
     } else {
         *buf = nullptr;
     }
-    this->m = PointerHolder<Members>(new Members());
+    this->m = std::shared_ptr<Members>(new Members());
 }
-- 
cgit v1.2.3-54-g00ecf