diff options
author | Jay Berkenbilt <ejb@ql.org> | 2022-02-04 16:10:19 +0100 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2022-02-04 19:12:37 +0100 |
commit | 9044a24097565c1a8eb542ae0eabb2539b3cc62b (patch) | |
tree | 0cc501c50bdacab8b58197623b7a17304bfff48f /libtests/qutil.cc | |
parent | f727bc94432905d79af23cf0aef14854965da2cd (diff) | |
download | qpdf-9044a24097565c1a8eb542ae0eabb2539b3cc62b.tar.zst |
PointerHolder: deprecate getPointer() and getRefcount()
Use get() and use_count() instead. Add #define
NO_POINTERHOLDER_DEPRECATION to remove deprecation markers for these
only.
This commit also removes all deprecated PointerHolder API calls from
qpdf's code except in PointerHolder's test suite, which must continue
to test the deprecated APIs.
Diffstat (limited to 'libtests/qutil.cc')
-rw-r--r-- | libtests/qutil.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libtests/qutil.cc b/libtests/qutil.cc index f59b564d..a74ae4fe 100644 --- a/libtests/qutil.cc +++ b/libtests/qutil.cc @@ -528,7 +528,7 @@ void read_from_file_test() size_t size = 0; QUtil::read_file_into_memory("other-file", buf, size); std::cout << "read " << size << " bytes" << std::endl; - char const* p = buf.getPointer(); + char const* p = buf.get(); assert(size == 24652); assert(memcmp(p, "This file is used for qutil testing.", 36) == 0); assert(p[59] == static_cast<char>(13)); @@ -609,11 +609,11 @@ void rename_delete_test() fprintf(f1, "one"); fclose(f1); QUtil::read_file_into_memory("old\xcf\x80", buf, size); - assert(memcmp(buf.getPointer(), "one", 3) == 0); + assert(memcmp(buf.get(), "one", 3) == 0); std::cout << "rename file" << std::endl;; QUtil::rename_file("old\xcf\x80", "old\xcf\x80.~tmp"); QUtil::read_file_into_memory("old\xcf\x80.~tmp", buf, size); - assert(memcmp(buf.getPointer(), "one", 3) == 0); + assert(memcmp(buf.get(), "one", 3) == 0); assert_no_file("old\xcf\x80"); std::cout << "create file" << std::endl;; f1 = QUtil::safe_fopen("old\xcf\x80", "w"); @@ -622,7 +622,7 @@ void rename_delete_test() std::cout << "rename over existing" << std::endl;; QUtil::rename_file("old\xcf\x80", "old\xcf\x80.~tmp"); QUtil::read_file_into_memory("old\xcf\x80.~tmp", buf, size); - assert(memcmp(buf.getPointer(), "two", 3) == 0); + assert(memcmp(buf.get(), "two", 3) == 0); assert_no_file("old\xcf\x80"); std::cout << "delete file" << std::endl;; QUtil::remove_file("old\xcf\x80.~tmp"); |