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

34 files changed, 97 insertions, 97 deletions

diff --git a/include/qpdf/Buffer.hh b/include/qpdf/Buffer.hh
index 4bddc1ef..d725006a 100644
--- a/include/qpdf/Buffer.hh
+++ b/include/qpdf/Buffer.hh
@@ -75,7 +75,7 @@ class Buffer
 
     void copy(Buffer const&);
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // BUFFER_HH
diff --git a/include/qpdf/BufferInputSource.hh b/include/qpdf/BufferInputSource.hh
index 7f94b8e8..6fd92e16 100644
--- a/include/qpdf/BufferInputSource.hh
+++ b/include/qpdf/BufferInputSource.hh
@@ -73,7 +73,7 @@ class BufferInputSource: public InputSource
         qpdf_offset_t max_offset;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDF_BUFFERINPUTSOURCE_HH
diff --git a/include/qpdf/ClosedFileInputSource.hh b/include/qpdf/ClosedFileInputSource.hh
index 8a4a02a5..cbaa9a52 100644
--- a/include/qpdf/ClosedFileInputSource.hh
+++ b/include/qpdf/ClosedFileInputSource.hh
@@ -84,10 +84,10 @@ class ClosedFileInputSource: public InputSource
 
         std::string filename;
         qpdf_offset_t offset;
-        PointerHolder<FileInputSource> fis;
+        std::shared_ptr<FileInputSource> fis;
         bool stay_open;
     };
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDF_CLOSEDFILEINPUTSOURCE_HH
diff --git a/include/qpdf/FileInputSource.hh b/include/qpdf/FileInputSource.hh
index 3a70778f..000590c3 100644
--- a/include/qpdf/FileInputSource.hh
+++ b/include/qpdf/FileInputSource.hh
@@ -71,7 +71,7 @@ class FileInputSource: public InputSource
         FILE* file;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDF_FILEINPUTSOURCE_HH
diff --git a/include/qpdf/InputSource.hh b/include/qpdf/InputSource.hh
index 044dc385..b53ac0b3 100644
--- a/include/qpdf/InputSource.hh
+++ b/include/qpdf/InputSource.hh
@@ -114,7 +114,7 @@ class QPDF_DLL_CLASS InputSource
         Members(Members const&);
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDF_INPUTSOURCE_HH
diff --git a/include/qpdf/JSON.hh b/include/qpdf/JSON.hh
index 2f54721c..2961d8a9 100644
--- a/include/qpdf/JSON.hh
+++ b/include/qpdf/JSON.hh
@@ -219,7 +219,7 @@ class JSON
         std::shared_ptr<JSON_value> value;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // JSON_HH
diff --git a/include/qpdf/Pl_Buffer.hh b/include/qpdf/Pl_Buffer.hh
index 70f5e29b..2556e672 100644
--- a/include/qpdf/Pl_Buffer.hh
+++ b/include/qpdf/Pl_Buffer.hh
@@ -59,7 +59,7 @@ class Pl_Buffer: public Pipeline
 
     // Same as getBuffer but wraps the result in a shared pointer.
     QPDF_DLL
-    PointerHolder<Buffer> getBufferSharedPointer();
+    std::shared_ptr<Buffer> getBufferSharedPointer();
 
     // getMallocBuffer behaves in the same was as getBuffer except the
     // buffer is allocated with malloc(), making it suitable for use
@@ -84,11 +84,11 @@ class Pl_Buffer: public Pipeline
         Members(Members const&);
 
         bool ready;
-        PointerHolder<Buffer> data;
+        std::shared_ptr<Buffer> data;
         size_t total_size;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // PL_BUFFER_HH
diff --git a/include/qpdf/Pl_Concatenate.hh b/include/qpdf/Pl_Concatenate.hh
index 070990dd..806d61ea 100644
--- a/include/qpdf/Pl_Concatenate.hh
+++ b/include/qpdf/Pl_Concatenate.hh
@@ -63,7 +63,7 @@ class Pl_Concatenate: public Pipeline
         Members(Members const&);
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // PL_CONCATENATE_HH
diff --git a/include/qpdf/Pl_Count.hh b/include/qpdf/Pl_Count.hh
index b21153d4..4b8f441c 100644
--- a/include/qpdf/Pl_Count.hh
+++ b/include/qpdf/Pl_Count.hh
@@ -66,7 +66,7 @@ class Pl_Count: public Pipeline
         unsigned char last_char;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // PL_COUNT_HH
diff --git a/include/qpdf/Pl_DCT.hh b/include/qpdf/Pl_DCT.hh
index 55ca4ff9..9481fee9 100644
--- a/include/qpdf/Pl_DCT.hh
+++ b/include/qpdf/Pl_DCT.hh
@@ -106,7 +106,7 @@ class Pl_DCT: public Pipeline
         CompressConfig* config_callback;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // PL_DCT_HH
diff --git a/include/qpdf/Pl_Discard.hh b/include/qpdf/Pl_Discard.hh
index c8904e56..277461d9 100644
--- a/include/qpdf/Pl_Discard.hh
+++ b/include/qpdf/Pl_Discard.hh
@@ -56,7 +56,7 @@ class Pl_Discard: public Pipeline
         Members(Members const&);
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // PL_DISCARD_HH
diff --git a/include/qpdf/Pl_Flate.hh b/include/qpdf/Pl_Flate.hh
index 74d21c5a..90c0bbde 100644
--- a/include/qpdf/Pl_Flate.hh
+++ b/include/qpdf/Pl_Flate.hh
@@ -85,7 +85,7 @@ class Pl_Flate: public Pipeline
         std::function<void(char const*, int)> callback;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // PL_FLATE_HH
diff --git a/include/qpdf/Pl_QPDFTokenizer.hh b/include/qpdf/Pl_QPDFTokenizer.hh
index 58a218b5..a5ac3ccc 100644
--- a/include/qpdf/Pl_QPDFTokenizer.hh
+++ b/include/qpdf/Pl_QPDFTokenizer.hh
@@ -76,7 +76,7 @@ class Pl_QPDFTokenizer: public Pipeline
         QPDFTokenizer tokenizer;
         Pl_Buffer buf;
     };
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // PL_QPDFTOKENIZER_HH
diff --git a/include/qpdf/Pl_RunLength.hh b/include/qpdf/Pl_RunLength.hh
index 6761bfeb..e93c5fb6 100644
--- a/include/qpdf/Pl_RunLength.hh
+++ b/include/qpdf/Pl_RunLength.hh
@@ -64,7 +64,7 @@ class Pl_RunLength: public Pipeline
         unsigned int length;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // PL_RUNLENGTH_HH
diff --git a/include/qpdf/Pl_StdioFile.hh b/include/qpdf/Pl_StdioFile.hh
index b9b000a5..ffc7a790 100644
--- a/include/qpdf/Pl_StdioFile.hh
+++ b/include/qpdf/Pl_StdioFile.hh
@@ -63,7 +63,7 @@ class Pl_StdioFile: public Pipeline
         FILE* file;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // PL_STDIOFILE_HH
diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh
index d1d9f268..bc65ee80 100644
--- a/include/qpdf/QPDF.hh
+++ b/include/qpdf/QPDF.hh
@@ -108,7 +108,7 @@ class QPDF
     // InputSource and use this method.
     QPDF_DLL
     void
-    processInputSource(PointerHolder<InputSource>, char const* password = 0);
+    processInputSource(std::shared_ptr<InputSource>, char const* password = 0);
 
     // Close or otherwise release the input source. Once this has been
     // called, no other methods of qpdf can be called safely except
@@ -714,7 +714,7 @@ class QPDF
             std::map<int, QPDFXRefEntry> const& xref,
             std::map<int, qpdf_offset_t> const& lengths,
             std::map<int, int> const& obj_renumber,
-            PointerHolder<Buffer>& hint_stream,
+            std::shared_ptr<Buffer>& hint_stream,
             int& S,
             int& O)
         {
@@ -742,14 +742,14 @@ class QPDF
         friend class QPDFObjectHandle;
 
       private:
-        static PointerHolder<QPDFObject>
+        static std::shared_ptr<QPDFObject>
         resolve(QPDF* qpdf, int objid, int generation)
         {
             return qpdf->resolve(objid, generation);
         }
         static bool
         objectChanged(
-            QPDF* qpdf, QPDFObjGen const& og, PointerHolder<QPDFObject>& oph)
+            QPDF* qpdf, QPDFObjGen const& og, std::shared_ptr<QPDFObject>& oph)
         {
             return qpdf->objectChanged(og, oph);
         }
@@ -841,7 +841,7 @@ class QPDF
         {
         }
         ObjCache(
-            PointerHolder<QPDFObject> object,
+            std::shared_ptr<QPDFObject> object,
             qpdf_offset_t end_before_space,
             qpdf_offset_t end_after_space) :
             object(object),
@@ -850,7 +850,7 @@ class QPDF
         {
         }
 
-        PointerHolder<QPDFObject> object;
+        std::shared_ptr<QPDFObject> object;
         qpdf_offset_t end_before_space;
         qpdf_offset_t end_after_space;
     };
@@ -896,8 +896,8 @@ class QPDF
 
       public:
         ForeignStreamData(
-            PointerHolder<EncryptionParameters> encp,
-            PointerHolder<InputSource> file,
+            std::shared_ptr<EncryptionParameters> encp,
+            std::shared_ptr<InputSource> file,
             int foreign_objid,
             int foreign_generation,
             qpdf_offset_t offset,
@@ -905,8 +905,8 @@ class QPDF
             QPDFObjectHandle local_dict);
 
       private:
-        PointerHolder<EncryptionParameters> encp;
-        PointerHolder<InputSource> file;
+        std::shared_ptr<EncryptionParameters> encp;
+        std::shared_ptr<InputSource> file;
         int foreign_objid;
         int foreign_generation;
         qpdf_offset_t offset;
@@ -930,12 +930,12 @@ class QPDF
         void registerForeignStream(
             QPDFObjGen const& local_og, QPDFObjectHandle foreign_stream);
         void registerForeignStream(
-            QPDFObjGen const& local_og, PointerHolder<ForeignStreamData>);
+            QPDFObjGen const& local_og, std::shared_ptr<ForeignStreamData>);
 
       private:
         QPDF& destination_qpdf;
         std::map<QPDFObjGen, QPDFObjectHandle> foreign_streams;
-        std::map<QPDFObjGen, PointerHolder<ForeignStreamData>>
+        std::map<QPDFObjGen, std::shared_ptr<ForeignStreamData>>
             foreign_stream_data;
     };
 
@@ -994,18 +994,18 @@ class QPDF
     void setLastObjectDescription(
         std::string const& description, int objid, int generation);
     QPDFObjectHandle readObject(
-        PointerHolder<InputSource>,
+        std::shared_ptr<InputSource>,
         std::string const& description,
         int objid,
         int generation,
         bool in_object_stream);
     size_t recoverStreamLength(
-        PointerHolder<InputSource> input,
+        std::shared_ptr<InputSource> input,
         int objid,
         int generation,
         qpdf_offset_t stream_offset);
     QPDFTokenizer::Token
-    readToken(PointerHolder<InputSource>, size_t max_len = 0);
+    readToken(std::shared_ptr<InputSource>, size_t max_len = 0);
 
     QPDFObjectHandle readObjectAtOffset(
         bool attempt_recovery,
@@ -1015,8 +1015,8 @@ class QPDF
         int exp_generation,
         int& act_objid,
         int& act_generation);
-    bool objectChanged(QPDFObjGen const& og, PointerHolder<QPDFObject>& oph);
-    PointerHolder<QPDFObject> resolve(int objid, int generation);
+    bool objectChanged(QPDFObjGen const& og, std::shared_ptr<QPDFObject>& oph);
+    std::shared_ptr<QPDFObject> resolve(int objid, int generation);
     void resolveObjectsInStream(int obj_stream_number);
     void stopOnError(std::string const& message);
 
@@ -1031,13 +1031,13 @@ class QPDF
         bool suppress_warnings,
         bool will_retry);
     bool pipeForeignStreamData(
-        PointerHolder<ForeignStreamData>,
+        std::shared_ptr<ForeignStreamData>,
         Pipeline*,
         bool suppress_warnings,
         bool will_retry);
     static bool pipeStreamData(
-        PointerHolder<QPDF::EncryptionParameters> encp,
-        PointerHolder<InputSource> file,
+        std::shared_ptr<QPDF::EncryptionParameters> encp,
+        std::shared_ptr<InputSource> file,
         QPDF& qpdf_for_warning,
         int objid,
         int generation,
@@ -1064,7 +1064,7 @@ class QPDF
         std::map<int, QPDFXRefEntry> const& xref,
         std::map<int, qpdf_offset_t> const& lengths,
         std::map<int, int> const& obj_renumber,
-        PointerHolder<Buffer>& hint_stream,
+        std::shared_ptr<Buffer>& hint_stream,
         int& S,
         int& O);
 
@@ -1089,10 +1089,10 @@ class QPDF
 
     // methods to support encryption -- implemented in QPDF_encryption.cc
     static encryption_method_e
-    interpretCF(PointerHolder<EncryptionParameters> encp, QPDFObjectHandle);
+    interpretCF(std::shared_ptr<EncryptionParameters> encp, QPDFObjectHandle);
     void initializeEncryption();
     static std::string getKeyForObject(
-        PointerHolder<EncryptionParameters> encp,
+        std::shared_ptr<EncryptionParameters> encp,
         int objid,
         int generation,
         bool use_aes);
@@ -1106,8 +1106,8 @@ class QPDF
         EncryptionData const& data,
         bool& perms_valid);
     static void decryptStream(
-        PointerHolder<EncryptionParameters> encp,
-        PointerHolder<InputSource> file,
+        std::shared_ptr<EncryptionParameters> encp,
+        std::shared_ptr<InputSource> file,
         QPDF& qpdf_for_warning,
         Pipeline*& pipeline,
         int objid,
@@ -1522,7 +1522,7 @@ class QPDF
 
         unsigned long long unique_id;
         QPDFTokenizer tokenizer;
-        PointerHolder<InputSource> file;
+        std::shared_ptr<InputSource> file;
         std::string last_object_description;
         bool provided_password_is_hex_key;
         bool ignore_xref_streams;
@@ -1530,7 +1530,7 @@ class QPDF
         std::ostream* out_stream;
         std::ostream* err_stream;
         bool attempt_recovery;
-        PointerHolder<EncryptionParameters> encp;
+        std::shared_ptr<EncryptionParameters> encp;
         std::string pdf_version;
         std::map<QPDFObjGen, QPDFXRefEntry> xref_table;
         std::set<int> deleted_objects;
@@ -1542,7 +1542,7 @@ class QPDF
         bool pushed_inherited_attributes_to_pages;
         std::vector<QPDFExc> warnings;
         std::map<unsigned long long, ObjCopier> object_copiers;
-        PointerHolder<QPDFObjectHandle::StreamDataProvider> copied_streams;
+        std::shared_ptr<QPDFObjectHandle::StreamDataProvider> copied_streams;
         // copied_stream_data_provider is owned by copied_streams
         CopiedStreamDataProvider* copied_stream_data_provider;
         bool reconstructed_xref;
@@ -1590,7 +1590,7 @@ class QPDF
     // Keep all member variables inside the Members object, which we
     // dynamically allocate. This makes it possible to add new private
     // members without breaking binary compatibility.
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDF_HH
diff --git a/include/qpdf/QPDFAcroFormDocumentHelper.hh b/include/qpdf/QPDFAcroFormDocumentHelper.hh
index 236b2835..5347dcd9 100644
--- a/include/qpdf/QPDFAcroFormDocumentHelper.hh
+++ b/include/qpdf/QPDFAcroFormDocumentHelper.hh
@@ -305,7 +305,7 @@ class QPDFAcroFormDocumentHelper: public QPDFDocumentHelper
         std::map<std::string, std::set<QPDFObjGen>> name_to_fields;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDFACROFORMDOCUMENTHELPER_HH
diff --git a/include/qpdf/QPDFAnnotationObjectHelper.hh b/include/qpdf/QPDFAnnotationObjectHelper.hh
index 26ee050a..de408abd 100644
--- a/include/qpdf/QPDFAnnotationObjectHelper.hh
+++ b/include/qpdf/QPDFAnnotationObjectHelper.hh
@@ -115,7 +115,7 @@ class QPDFAnnotationObjectHelper: public QPDFObjectHelper
         Members(Members const&);
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDFANNOTATIONOBJECTHELPER_HH
diff --git a/include/qpdf/QPDFEFStreamObjectHelper.hh b/include/qpdf/QPDFEFStreamObjectHelper.hh
index d6192097..afcc5bd2 100644
--- a/include/qpdf/QPDFEFStreamObjectHelper.hh
+++ b/include/qpdf/QPDFEFStreamObjectHelper.hh
@@ -74,7 +74,7 @@ class QPDFEFStreamObjectHelper: public QPDFObjectHelper
     // parameters may be supplied using setters defined below.
     QPDF_DLL
     static QPDFEFStreamObjectHelper
-    createEFStream(QPDF& qpdf, PointerHolder<Buffer> data);
+    createEFStream(QPDF& qpdf, std::shared_ptr<Buffer> data);
     QPDF_DLL
     static QPDFEFStreamObjectHelper
     createEFStream(QPDF& qpdf, std::string const& data);
@@ -116,7 +116,7 @@ class QPDFEFStreamObjectHelper: public QPDFObjectHelper
         Members(Members const&) = delete;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDFEFSTREAMOBJECTHELPER_HH
diff --git a/include/qpdf/QPDFEmbeddedFileDocumentHelper.hh b/include/qpdf/QPDFEmbeddedFileDocumentHelper.hh
index 73d5f041..f09e8c24 100644
--- a/include/qpdf/QPDFEmbeddedFileDocumentHelper.hh
+++ b/include/qpdf/QPDFEmbeddedFileDocumentHelper.hh
@@ -91,7 +91,7 @@ class QPDFEmbeddedFileDocumentHelper: public QPDFDocumentHelper
         std::shared_ptr<QPDFNameTreeObjectHelper> embedded_files;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDFEMBEDDEDFILEDOCUMENTHELPER_HH
diff --git a/include/qpdf/QPDFFileSpecObjectHelper.hh b/include/qpdf/QPDFFileSpecObjectHelper.hh
index 87c94399..d0b4f185 100644
--- a/include/qpdf/QPDFFileSpecObjectHelper.hh
+++ b/include/qpdf/QPDFFileSpecObjectHelper.hh
@@ -113,7 +113,7 @@ class QPDFFileSpecObjectHelper: public QPDFObjectHelper
         Members(Members const&) = delete;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDFFILESPECOBJECTHELPER_HH
diff --git a/include/qpdf/QPDFFormFieldObjectHelper.hh b/include/qpdf/QPDFFormFieldObjectHelper.hh
index 871816ab..e5ffeef2 100644
--- a/include/qpdf/QPDFFormFieldObjectHelper.hh
+++ b/include/qpdf/QPDFFormFieldObjectHelper.hh
@@ -236,7 +236,7 @@ class QPDFFormFieldObjectHelper: public QPDFObjectHelper
         Members(Members const&);
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDFFORMFIELDOBJECTHELPER_HH
diff --git a/include/qpdf/QPDFJob.hh b/include/qpdf/QPDFJob.hh
index 510c6d18..cf65d10b 100644
--- a/include/qpdf/QPDFJob.hh
+++ b/include/qpdf/QPDFJob.hh
@@ -453,7 +453,7 @@ class QPDFJob
     std::shared_ptr<QPDF> processFile(
         char const* filename, char const* password, bool used_for_input);
     std::shared_ptr<QPDF> processInputSource(
-        PointerHolder<InputSource> is,
+        std::shared_ptr<InputSource> is,
         char const* password,
         bool used_for_input);
     std::shared_ptr<QPDF> doProcess(
diff --git a/include/qpdf/QPDFNameTreeObjectHelper.hh b/include/qpdf/QPDFNameTreeObjectHelper.hh
index 1523b142..2060579b 100644
--- a/include/qpdf/QPDFNameTreeObjectHelper.hh
+++ b/include/qpdf/QPDFNameTreeObjectHelper.hh
@@ -204,7 +204,7 @@ class QPDFNameTreeObjectHelper: public QPDFObjectHelper
         std::shared_ptr<NNTreeImpl> impl;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDFNAMETREEOBJECTHELPER_HH
diff --git a/include/qpdf/QPDFNumberTreeObjectHelper.hh b/include/qpdf/QPDFNumberTreeObjectHelper.hh
index 0f0acf06..bb34373c 100644
--- a/include/qpdf/QPDFNumberTreeObjectHelper.hh
+++ b/include/qpdf/QPDFNumberTreeObjectHelper.hh
@@ -226,7 +226,7 @@ class QPDFNumberTreeObjectHelper: public QPDFObjectHelper
         std::shared_ptr<NNTreeImpl> impl;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDFNUMBERTREEOBJECTHELPER_HH
diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh
index f304aacf..4c1fe6e6 100644
--- a/include/qpdf/QPDFObjectHandle.hh
+++ b/include/qpdf/QPDFObjectHandle.hh
@@ -434,7 +434,7 @@ class QPDFObjectHandle
     // objects that are ready from the object's input stream.
     QPDF_DLL
     static QPDFObjectHandle parse(
-        PointerHolder<InputSource> input,
+        std::shared_ptr<InputSource> input,
         std::string const& object_description,
         QPDFTokenizer&,
         bool& empty,
@@ -490,7 +490,7 @@ class QPDFObjectHandle
     // handle the case of pages whose contents are split across
     // multiple streams.
     QPDF_DLL
-    void addTokenFilter(PointerHolder<TokenFilter> token_filter);
+    void addTokenFilter(std::shared_ptr<TokenFilter> token_filter);
 
     // Legacy helpers for parsing content streams. These methods are
     // not going away, but newer code should call the correspond
@@ -506,7 +506,7 @@ class QPDFObjectHandle
     QPDF_DLL
     void pipePageContents(Pipeline* p);
     QPDF_DLL
-    void addContentTokenFilter(PointerHolder<TokenFilter> token_filter);
+    void addContentTokenFilter(std::shared_ptr<TokenFilter> token_filter);
     // End legacy content stream helpers
 
     // Called on a stream to filter the stream as if it were page
@@ -618,11 +618,11 @@ class QPDFObjectHandle
     // uncompressed stream data.  Example programs are provided that
     // illustrate this.
     QPDF_DLL
-    static QPDFObjectHandle newStream(QPDF* qpdf, PointerHolder<Buffer> data);
+    static QPDFObjectHandle newStream(QPDF* qpdf, std::shared_ptr<Buffer> data);
 
     // Create new stream with data from string.  This method will
     // create a copy of the data rather than using the user-provided
-    // buffer as in the PointerHolder<Buffer> version of newStream.
+    // buffer as in the std::shared_ptr<Buffer> version of newStream.
     QPDF_DLL
     static QPDFObjectHandle newStream(QPDF* qpdf, std::string const& data);
 
@@ -1089,12 +1089,12 @@ class QPDFObjectHandle
     // Returns filtered (uncompressed) stream data.  Throws an
     // exception if the stream is filtered and we can't decode it.
     QPDF_DLL
-    PointerHolder<Buffer>
+    std::shared_ptr<Buffer>
     getStreamData(qpdf_stream_decode_level_e level = qpdf_dl_generalized);
 
     // Returns unfiltered (raw) stream data.
     QPDF_DLL
-    PointerHolder<Buffer> getRawStreamData();
+    std::shared_ptr<Buffer> getRawStreamData();
 
     // Write stream data through the given pipeline. A null pipeline
     // value may be used if all you want to do is determine whether a
@@ -1201,13 +1201,13 @@ class QPDFObjectHandle
     // decryption filters have been applied, is as presented.
     QPDF_DLL
     void replaceStreamData(
-        PointerHolder<Buffer> data,
+        std::shared_ptr<Buffer> data,
         QPDFObjectHandle const& filter,
         QPDFObjectHandle const& decode_parms);
 
     // Replace the stream's stream data with the given string.
     // This method will create a copy of the data rather than using
-    // the user-provided buffer as in the PointerHolder<Buffer> version
+    // the user-provided buffer as in the std::shared_ptr<Buffer> version
     // of replaceStreamData.
     QPDF_DLL
     void replaceStreamData(
@@ -1242,7 +1242,7 @@ class QPDFObjectHandle
     // compute the length in advance.
     QPDF_DLL
     void replaceStreamData(
-        PointerHolder<StreamDataProvider> provider,
+        std::shared_ptr<StreamDataProvider> provider,
         QPDFObjectHandle const& filter,
         QPDFObjectHandle const& decode_parms);
 
@@ -1373,7 +1373,7 @@ class QPDFObjectHandle
         friend class QPDF;
 
       private:
-        static PointerHolder<QPDFObject>
+        static std::shared_ptr<QPDFObject>
         getObject(QPDFObjectHandle& o)
         {
             o.dereference();
@@ -1496,10 +1496,10 @@ class QPDFObjectHandle
         QPDFObjectHandle,
         QPDF*,
         std::string const&,
-        PointerHolder<InputSource>,
+        std::shared_ptr<InputSource>,
         qpdf_offset_t);
     static QPDFObjectHandle parseInternal(
-        PointerHolder<InputSource> input,
+        std::shared_ptr<InputSource> input,
         std::string const& object_description,
         QPDFTokenizer& tokenizer,
         bool& empty,
@@ -1510,7 +1510,7 @@ class QPDFObjectHandle
     void parseContentStream_internal(
         std::string const& description, ParserCallbacks* callbacks);
     static void parseContentStream_data(
-        PointerHolder<Buffer>,
+        std::shared_ptr<Buffer>,
         std::string const& description,
         ParserCallbacks* callbacks,
         QPDF* context);
@@ -1527,7 +1527,7 @@ class QPDFObjectHandle
     QPDF* qpdf;
     int objid; // 0 for direct object
     int generation;
-    PointerHolder<QPDFObject> obj;
+    std::shared_ptr<QPDFObject> obj;
     bool reserved;
 };
 
@@ -1629,7 +1629,7 @@ class QPDFObjectHandle::QPDFDictItems
             std::set<std::string>::iterator iter;
             bool is_end;
         };
-        PointerHolder<Members> m;
+        std::shared_ptr<Members> m;
         value_type ivalue;
     };
 
@@ -1727,7 +1727,7 @@ class QPDFObjectHandle::QPDFArrayItems
             int item_number;
             bool is_end;
         };
-        PointerHolder<Members> m;
+        std::shared_ptr<Members> m;
         value_type ivalue;
     };
 
diff --git a/include/qpdf/QPDFOutlineDocumentHelper.hh b/include/qpdf/QPDFOutlineDocumentHelper.hh
index 60079718..2049a072 100644
--- a/include/qpdf/QPDFOutlineDocumentHelper.hh
+++ b/include/qpdf/QPDFOutlineDocumentHelper.hh
@@ -97,11 +97,11 @@ class QPDFOutlineDocumentHelper: public QPDFDocumentHelper
         std::vector<QPDFOutlineObjectHelper> outlines;
         std::set<QPDFObjGen> seen;
         QPDFObjectHandle dest_dict;
-        PointerHolder<QPDFNameTreeObjectHelper> names_dest;
+        std::shared_ptr<QPDFNameTreeObjectHelper> names_dest;
         std::map<QPDFObjGen, std::vector<QPDFOutlineObjectHelper>> by_page;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDFOUTLINEDOCUMENTHELPER_HH
diff --git a/include/qpdf/QPDFOutlineObjectHelper.hh b/include/qpdf/QPDFOutlineObjectHelper.hh
index e8ed414d..ece5acf0 100644
--- a/include/qpdf/QPDFOutlineObjectHelper.hh
+++ b/include/qpdf/QPDFOutlineObjectHelper.hh
@@ -51,7 +51,7 @@ class QPDFOutlineObjectHelper: public QPDFObjectHelper
     // Return parent pointer. Returns a null pointer if this is a
     // top-level outline.
     QPDF_DLL
-    PointerHolder<QPDFOutlineObjectHelper> getParent();
+    std::shared_ptr<QPDFOutlineObjectHelper> getParent();
 
     // Return children as a list.
     QPDF_DLL
@@ -112,11 +112,11 @@ class QPDFOutlineObjectHelper: public QPDFObjectHelper
         Members(Members const&);
 
         QPDFOutlineDocumentHelper& dh;
-        PointerHolder<QPDFOutlineObjectHelper> parent;
+        std::shared_ptr<QPDFOutlineObjectHelper> parent;
         std::vector<QPDFOutlineObjectHelper> kids;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDFOUTLINEOBJECTHELPER_HH
diff --git a/include/qpdf/QPDFPageDocumentHelper.hh b/include/qpdf/QPDFPageDocumentHelper.hh
index d8b2e915..2ffa8dd1 100644
--- a/include/qpdf/QPDFPageDocumentHelper.hh
+++ b/include/qpdf/QPDFPageDocumentHelper.hh
@@ -151,7 +151,7 @@ class QPDFPageDocumentHelper: public QPDFDocumentHelper
         Members(Members const&);
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDFPAGEDOCUMENTHELPER_HH
diff --git a/include/qpdf/QPDFPageLabelDocumentHelper.hh b/include/qpdf/QPDFPageLabelDocumentHelper.hh
index 6922e0a9..eef2accc 100644
--- a/include/qpdf/QPDFPageLabelDocumentHelper.hh
+++ b/include/qpdf/QPDFPageLabelDocumentHelper.hh
@@ -96,10 +96,10 @@ class QPDFPageLabelDocumentHelper: public QPDFDocumentHelper
         Members();
         Members(Members const&);
 
-        PointerHolder<QPDFNumberTreeObjectHelper> labels;
+        std::shared_ptr<QPDFNumberTreeObjectHelper> labels;
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDFPAGELABELDOCUMENTHELPER_HH
diff --git a/include/qpdf/QPDFPageObjectHelper.hh b/include/qpdf/QPDFPageObjectHelper.hh
index 961bac4b..7431a9b3 100644
--- a/include/qpdf/QPDFPageObjectHelper.hh
+++ b/include/qpdf/QPDFPageObjectHelper.hh
@@ -225,7 +225,7 @@ class QPDFPageObjectHelper: public QPDFObjectHelper
     // stream. Also works on form XObjects.
     QPDF_DLL
     void addContentTokenFilter(
-        PointerHolder<QPDFObjectHandle::TokenFilter> token_filter);
+        std::shared_ptr<QPDFObjectHandle::TokenFilter> token_filter);
 
     // A page's resources dictionary maps names to objects elsewhere
     // in the file. This method walks through a page's contents and
@@ -397,7 +397,7 @@ class QPDFPageObjectHelper: public QPDFObjectHelper
         Members(Members const&);
     };
 
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDFPAGEOBJECTHELPER_HH
diff --git a/include/qpdf/QPDFTokenizer.hh b/include/qpdf/QPDFTokenizer.hh
index 8adc7db9..9cd51acc 100644
--- a/include/qpdf/QPDFTokenizer.hh
+++ b/include/qpdf/QPDFTokenizer.hh
@@ -173,7 +173,7 @@ class QPDFTokenizer
     // beginning of the token.
     QPDF_DLL
     Token readToken(
-        PointerHolder<InputSource> input,
+        std::shared_ptr<InputSource> input,
         std::string const& context,
         bool allow_bad = false,
         size_t max_len = 0);
@@ -187,7 +187,7 @@ class QPDFTokenizer
     // tt_inline_image or tt_bad. This is the only way readToken
     // returns a tt_inline_image token.
     QPDF_DLL
-    void expectInlineImage(PointerHolder<InputSource> input);
+    void expectInlineImage(std::shared_ptr<InputSource> input);
 
   private:
     QPDFTokenizer(QPDFTokenizer const&) = delete;
@@ -196,7 +196,7 @@ class QPDFTokenizer
     void resolveLiteral();
     bool isSpace(char);
     bool isDelimiter(char);
-    void findEI(PointerHolder<InputSource> input);
+    void findEI(std::shared_ptr<InputSource> input);
 
     enum state_e {
         st_top,
@@ -246,7 +246,7 @@ class QPDFTokenizer
         bool last_char_was_bs;
         bool last_char_was_cr;
     };
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDFTOKENIZER_HH
diff --git a/include/qpdf/QPDFWriter.hh b/include/qpdf/QPDFWriter.hh
index 369bc946..c5e33fd2 100644
--- a/include/qpdf/QPDFWriter.hh
+++ b/include/qpdf/QPDFWriter.hh
@@ -128,7 +128,7 @@ class QPDFWriter
 
     // Return getBuffer() in a shared pointer.
     QPDF_DLL
-    PointerHolder<Buffer> getBufferSharedPointer();
+    std::shared_ptr<Buffer> getBufferSharedPointer();
 
     // Supply your own pipeline object.  Output will be written to
     // this pipeline, and QPDFWriter will call finish() on the
@@ -499,7 +499,7 @@ class QPDFWriter
     // If you want to be notified of progress, derive a class from
     // ProgressReporter and override the reportProgress method.
     QPDF_DLL
-    void registerProgressReporter(PointerHolder<ProgressReporter>);
+    void registerProgressReporter(std::shared_ptr<ProgressReporter>);
 
     // Return the PDF version that will be written into the header.
     // Calling this method does all the preparation for writing, so it
@@ -550,7 +550,7 @@ class QPDFWriter
         friend class QPDFWriter;
 
       public:
-        PipelinePopper(QPDFWriter* qw, PointerHolder<Buffer>* bp = 0) :
+        PipelinePopper(QPDFWriter* qw, std::shared_ptr<Buffer>* bp = 0) :
             qw(qw),
             bp(bp)
         {
@@ -559,7 +559,7 @@ class QPDFWriter
 
       private:
         QPDFWriter* qw;
-        PointerHolder<Buffer>* bp;
+        std::shared_ptr<Buffer>* bp;
         std::string stack_id;
     };
     friend class PipelinePopper;
@@ -567,7 +567,7 @@ class QPDFWriter
     unsigned int bytesNeeded(long long n);
     void writeBinary(unsigned long long val, unsigned int bytes);
     void writeString(std::string const& str);
-    void writeBuffer(PointerHolder<Buffer>&);
+    void writeBuffer(std::shared_ptr<Buffer>&);
     void writeStringQDF(std::string const& str);
     void writeStringNoQDF(std::string const& str);
     void writePad(int nspaces);
@@ -587,7 +587,7 @@ class QPDFWriter
         QPDFObjectHandle stream,
         bool& compress_stream,
         bool& is_metadata,
-        PointerHolder<Buffer>* stream_data);
+        std::shared_ptr<Buffer>* stream_data);
     void unparseObject(
         QPDFObjectHandle object,
         int level,
@@ -791,7 +791,7 @@ class QPDFWriter
         std::map<int, int> object_to_object_stream_no_gen;
 
         // For progress reporting
-        PointerHolder<ProgressReporter> progress_reporter;
+        std::shared_ptr<ProgressReporter> progress_reporter;
         int events_expected;
         int events_seen;
         int next_progress_report;
@@ -800,7 +800,7 @@ class QPDFWriter
     // Keep all member variables inside the Members object, which we
     // dynamically allocate. This makes it possible to add new private
     // members without breaking binary compatibility.
-    PointerHolder<Members> m;
+    std::shared_ptr<Members> m;
 };
 
 #endif // QPDFWRITER_HH
diff --git a/include/qpdf/QUtil.hh b/include/qpdf/QUtil.hh
index 37eea484..ce2f797f 100644
--- a/include/qpdf/QUtil.hh
+++ b/include/qpdf/QUtil.hh
@@ -420,7 +420,7 @@ namespace QUtil
 
     QPDF_DLL
     void read_file_into_memory(
-        char const* filename, PointerHolder<char>& file_buf, size_t& size);
+        char const* filename, std::shared_ptr<char>& file_buf, size_t& size);
 
     // This used to be called strcasecmp, but that is a macro on some
     // platforms, so we have to give it a name that is not likely to