octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2025-01-03 15:17:29 +00:00
Code Issues Releases Wiki Activity

Explicitly deprecate old name/number tree constructors

Browse Source 
Use C++14 [[deprecated]] tag
This commit is contained in:
Jay Berkenbilt 2021-02-10 15:02:11 -05:00
parent 1b3f84f967
commit 2538d84413
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/qpdf/QPDFNameTreeObjectHelper.hh
View File

@ -55,6 +55,7 @@ class QPDFNameTreeObjectHelper: public QPDFObjectHelper
// QPDFNameTreeObjectHelper constructed in this way can't be // QPDFNameTreeObjectHelper constructed in this way can't be
// modified or repaired and will silently ignore problems in the // modified or repaired and will silently ignore problems in the
// structure. // structure.
[[deprecated]]
QPDF_DLL QPDF_DLL
QPDFNameTreeObjectHelper(QPDFObjectHandle); QPDFNameTreeObjectHelper(QPDFObjectHandle);

1
include/qpdf/QPDFNumberTreeObjectHelper.hh
View File

@ -52,6 +52,7 @@ class QPDFNumberTreeObjectHelper: public QPDFObjectHelper
// QPDFNumberTreeObjectHelper constructed in this way can't be // QPDFNumberTreeObjectHelper constructed in this way can't be
// modified or repaired and will silently ignore problems in the // modified or repaired and will silently ignore problems in the
// structure. // structure.
[[deprecated]]
QPDF_DLL QPDF_DLL
QPDFNumberTreeObjectHelper(QPDFObjectHandle); QPDFNumberTreeObjectHelper(QPDFObjectHandle);

20
qpdf/test_driver.cc
View File

@ -1856,8 +1856,18 @@ void runtest(int n, char const* filename1, char const* arg2)
// Exercise deprecated API until qpdf 11 // Exercise deprecated API until qpdf 11
std::cout << "/Bad1: deprecated API" << std::endl; std::cout << "/Bad1: deprecated API" << std::endl;
#ifdef _MSC_VER
# pragma warning (disable: 4996)
#endif
#if (defined(__GNUC__) || defined(__clang__))
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
auto bad1 = QPDFNumberTreeObjectHelper( auto bad1 = QPDFNumberTreeObjectHelper(
pdf.getTrailer().getKey("/Bad1")); pdf.getTrailer().getKey("/Bad1"));
#if (defined(__GNUC__) || defined(__clang__))
# pragma GCC diagnostic pop
#endif
assert(bad1.begin() == bad1.end()); assert(bad1.begin() == bad1.end());
std::cout << "/Bad1" << std::endl; std::cout << "/Bad1" << std::endl;
@ -2058,8 +2068,18 @@ void runtest(int n, char const* filename1, char const* arg2)
// Exercise deprecated API until qpdf 11 // Exercise deprecated API until qpdf 11
std::cout << "/Bad1: deprecated API" << std::endl; std::cout << "/Bad1: deprecated API" << std::endl;
#ifdef _MSC_VER
# pragma warning (disable: 4996)
#endif
#if (defined(__GNUC__) || defined(__clang__))
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
auto bad1 = QPDFNameTreeObjectHelper( auto bad1 = QPDFNameTreeObjectHelper(
pdf.getTrailer().getKey("/Bad1")); pdf.getTrailer().getKey("/Bad1"));
#if (defined(__GNUC__) || defined(__clang__))
# pragma GCC diagnostic pop
#endif
try try
{ {
bad1.find("G", true); bad1.find("G", true);