GraphicsMagick: Magick++/lib/Magick++/STL.h: Stop using std::una...
GraphicsMagick Commits <[email protected]> Sat, 04 May 2024 13:58:09 -0500
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.21406.1714849102.7900.graphicsmagick-commit@lists.sourceforge.net> |
changeset 903ae8fb5392 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=903ae8fb5392 summary: Magick++/lib/Magick++/STL.h: Stop using std::unary_function in C++'11 rather than C++'17. diffstat: ChangeLog | 8 ++++++++ Magick++/lib/Magick++/STL.h | 5 +++-- VisualMagick/installer/inc/version.isx | 4 ++-- magick/version.h | 4 ++-- www/ChangeLog.html | 10 ++++++++++ 5 files changed, 25 insertions(+), 6 deletions(-) diffs (80 lines): diff -r 32eef7653858 -r 903ae8fb5392 ChangeLog --- a/ChangeLog Tue Apr 23 16:54:07 2024 -0500 +++ b/ChangeLog Sat May 04 13:57:38 2024 -0500 @@ -1,3 +1,11 @@ +2024-05-04 Bob Friesenhahn <[email protected]> + + * Magick++/lib/Magick++/STL.h: I changed my mind and have decided + to stop using the deprecated std::unary_function in C++'11. + Hopefully this does not cause any ABI or other usage issues. + Please make me aware of any side-effects resulting from this + change. + 2024-04-23 Bob Friesenhahn <[email protected]> * www/contribute.rst: Remove mention of needing a formal diff -r 32eef7653858 -r 903ae8fb5392 Magick++/lib/Magick++/STL.h --- a/Magick++/lib/Magick++/STL.h Tue Apr 23 16:54:07 2024 -0500 +++ b/Magick++/lib/Magick++/STL.h Sat May 04 13:57:38 2024 -0500 @@ -45,13 +45,14 @@ // // Base class for all function objects used to manipulate images via // an Image reference. (used to inherit from std::unary_function, - // but it was removed in C++'17). + // but it was deprecated in C++'11, __cplusplus=201103L and removed + // in C++'17, __cplusplus=201703L ). // // https://en.cppreference.com/w/cpp/utility/functional/unary_function // https://en.cppreference.com/w/cpp/utility/functional/function // -#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201703L) || __cplusplus >= 201703L) +#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201103L) || __cplusplus >= 201103L) # define MAGICK_UNARY_FUNCTION_IMAGE_REF_BASE #else # define MAGICK_UNARY_FUNCTION_IMAGE_REF_BASE \ diff -r 32eef7653858 -r 903ae8fb5392 VisualMagick/installer/inc/version.isx --- a/VisualMagick/installer/inc/version.isx Tue Apr 23 16:54:07 2024 -0500 +++ b/VisualMagick/installer/inc/version.isx Sat May 04 13:57:38 2024 -0500 @@ -10,5 +10,5 @@ #define public MagickPackageName "GraphicsMagick" #define public MagickPackageVersion "1.4" -#define public MagickPackageVersionAddendum ".020240423" -#define public MagickPackageReleaseDate "snapshot-20240423" +#define public MagickPackageVersionAddendum ".020240504" +#define public MagickPackageReleaseDate "snapshot-20240504" diff -r 32eef7653858 -r 903ae8fb5392 magick/version.h --- a/magick/version.h Tue Apr 23 16:54:07 2024 -0500 +++ b/magick/version.h Sat May 04 13:57:38 2024 -0500 @@ -38,8 +38,8 @@ #define MagickLibVersion 0x282500 #define MagickLibVersionText "1.4" #define MagickLibVersionNumber 28,25,0 -#define MagickChangeDate "20240423" -#define MagickReleaseDate "snapshot-20240423" +#define MagickChangeDate "20240504" +#define MagickReleaseDate "snapshot-20240504" /* The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines diff -r 32eef7653858 -r 903ae8fb5392 www/ChangeLog.html --- a/www/ChangeLog.html Tue Apr 23 16:54:07 2024 -0500 +++ b/www/ChangeLog.html Sat May 04 13:57:38 2024 -0500 @@ -38,6 +38,16 @@ <div class="document" id="graphicsmagick-changelog"> <h1 class="title">GraphicsMagick ChangeLog</h1> +<p>2024-05-04 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p> +<blockquote> +<ul class="simple"> +<li><p>Magick++/lib/Magick++/STL.h: I changed my mind and have decided +to stop using the deprecated std::unary_function in C++'11. +Hopefully this does not cause any ABI or other usage issues. +Please make me aware of any side-effects resulting from this +change.</p></li> +</ul> +</blockquote> <p>2024-04-23 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p> <blockquote> <ul class="simple">