[patch] patch for C++17 for compliance with C++17

inkscape-0.92.4-c++17.patch (text/plain), 2.04 KB, created by Helmut Jarausch on 2019-02-01 16:10:51 UTC

--- a/src/ui/dialog/document-properties.cpp.ORIG	2019-01-15 05:29:27.000000000 +0100
+++ b/src/ui/dialog/document-properties.cpp	2019-02-01 12:24:16.664281733 +0100
@@ -563,7 +563,7 @@
 }
 
 struct _cmp {
-  bool operator()(const SPObject * const & a, const SPObject * const & b)
+  bool operator()(const SPObject * const & a, const SPObject * const & b) const
   {
     const Inkscape::ColorProfile &a_prof = reinterpret_cast<const Inkscape::ColorProfile &>(*a);
     const Inkscape::ColorProfile &b_prof = reinterpret_cast<const Inkscape::ColorProfile &>(*b);
--- a/src/vanishing-point.h.ORIG	2019-01-15 05:29:27.000000000 +0100
+++ b/src/vanishing-point.h	2019-02-01 11:59:38.876200785 +0100
@@ -104,7 +104,7 @@
         g_return_if_fail (_persp);
         persp3d_get_VP (_persp, _axis).print("");
     }
-    inline char const *axisString () { return Proj::string_from_axis(_axis); }
+    inline char const *axisString () const { return Proj::string_from_axis(_axis); }
 
     unsigned int my_counter;
     static unsigned int global_counter; // FIXME: Only to implement operator< so that we can merge lists. Do this in a better way!!
@@ -116,7 +116,7 @@
 struct VPDrag;
 
 struct less_ptr : public std::binary_function<VanishingPoint *, VanishingPoint *, bool> {
-    bool operator()(VanishingPoint *vp1, VanishingPoint *vp2) {
+    bool operator()(VanishingPoint *vp1, VanishingPoint *vp2) const {
         return GPOINTER_TO_INT(vp1) < GPOINTER_TO_INT(vp2);
     }
 };
--- a/src/ui/widget/color-icc-selector.cpp.ORIG	2019-01-15 05:29:27.000000000 +0100
+++ b/src/ui/widget/color-icc-selector.cpp	2019-02-01 12:31:47.770306444 +0100
@@ -673,7 +673,7 @@
 
 #if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 struct _cmp {
-  bool operator()(const SPObject * const & a, const SPObject * const & b)
+  bool operator()(const SPObject * const & a, const SPObject * const & b) const
   {
     const Inkscape::ColorProfile &a_prof = reinterpret_cast<const Inkscape::ColorProfile &>(*a);
     const Inkscape::ColorProfile &b_prof = reinterpret_cast<const Inkscape::ColorProfile &>(*b);