diff options
author | Jay Berkenbilt <ejb@ql.org> | 2022-04-09 20:35:56 +0200 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2022-04-09 23:33:29 +0200 |
commit | a68703b07e928be0eeb909c0e777e13e88cbf86d (patch) | |
tree | d63d53a9facc83d72cb82f400d1ae8cce6a2115f /libqpdf/QPDFTokenizer.cc | |
parent | ae819b5318bf0a0a21b80d6269ef73ed8123d5d6 (diff) | |
download | qpdf-a68703b07e928be0eeb909c0e777e13e88cbf86d.tar.zst |
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
Diffstat (limited to 'libqpdf/QPDFTokenizer.cc')
-rw-r--r-- | libqpdf/QPDFTokenizer.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libqpdf/QPDFTokenizer.cc b/libqpdf/QPDFTokenizer.cc index ade64cb2..0486fbc9 100644 --- a/libqpdf/QPDFTokenizer.cc +++ b/libqpdf/QPDFTokenizer.cc @@ -23,7 +23,8 @@ is_delimiter(char ch) class QPDFWordTokenFinder: public InputSource::Finder { public: - QPDFWordTokenFinder(PointerHolder<InputSource> is, std::string const& str) : + QPDFWordTokenFinder( + std::shared_ptr<InputSource> is, std::string const& str) : is(is), str(str) { @@ -34,7 +35,7 @@ class QPDFWordTokenFinder: public InputSource::Finder virtual bool check(); private: - PointerHolder<InputSource> is; + std::shared_ptr<InputSource> is; std::string str; }; @@ -503,7 +504,7 @@ QPDFTokenizer::presentEOF() } void -QPDFTokenizer::expectInlineImage(PointerHolder<InputSource> input) +QPDFTokenizer::expectInlineImage(std::shared_ptr<InputSource> input) { if (this->m->state != st_top) { throw std::logic_error("QPDFTokenizer::expectInlineImage called" @@ -514,7 +515,7 @@ QPDFTokenizer::expectInlineImage(PointerHolder<InputSource> input) } void -QPDFTokenizer::findEI(PointerHolder<InputSource> input) +QPDFTokenizer::findEI(std::shared_ptr<InputSource> input) { if (!input.get()) { return; @@ -645,7 +646,7 @@ QPDFTokenizer::betweenTokens() QPDFTokenizer::Token QPDFTokenizer::readToken( - PointerHolder<InputSource> input, + std::shared_ptr<InputSource> input, std::string const& context, bool allow_bad, size_t max_len) |