[mapguide-commits] r10071 - in branches/4.0/MgDev: . Common/Stylization

[svn_mapguide at osgeo.org]

Author: jng
Date: 2023-12-22 00:20:47 -0800 (Fri, 22 Dec 2023)
New Revision: 10071

Modified:
   branches/4.0/MgDev/
   branches/4.0/MgDev/Common/Stylization/SE_ExpressionBase.h
Log:
Merged revision(s) 10070 from sandbox/adsk/trunk:
remove deprecated class std::binary_function
........


Index: branches/4.0/MgDev
===================================================================
--- branches/4.0/MgDev	2023-11-22 04:35:21 UTC (rev 10070)
+++ branches/4.0/MgDev	2023-12-22 08:20:47 UTC (rev 10071)

Property changes on: branches/4.0/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
## -8,7 +8,7 ##
 /sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942,9019-9020,9486
 /sandbox/adsk/3.2o.AIMS:9135-9140,9146
 /sandbox/adsk/3.2p:9254
-/sandbox/adsk/trunk:9866-9867,9871-9873,9875-9881,9908
+/sandbox/adsk/trunk:9866-9867,9871-9873,9875-9881,9908,10070
 /sandbox/jng/basic_label_justification:10023-10025
 /sandbox/jng/catch2:9649-9676
 /sandbox/jng/clean_json:8818-9180
Modified: branches/4.0/MgDev/Common/Stylization/SE_ExpressionBase.h
===================================================================
--- branches/4.0/MgDev/Common/Stylization/SE_ExpressionBase.h	2023-11-22 04:35:21 UTC (rev 10070)
+++ branches/4.0/MgDev/Common/Stylization/SE_ExpressionBase.h	2023-12-22 08:20:47 UTC (rev 10071)
@@ -335,7 +335,7 @@
 //////////////////////////////////////////////////////////////////////////////
 typedef std::pair<const wchar_t*, const wchar_t*> ParamId;
 
-struct ParamCmpLess : std::binary_function<ParamId&, ParamId&, bool>
+struct ParamCmpLess
 {
 public:
     bool operator() (const ParamId& a, const ParamId& b) const
@@ -349,7 +349,7 @@
 };
 
 
-struct StrCmpLess : std::binary_function<const wchar_t*, const wchar_t*, bool>
+struct StrCmpLess
 {
 public:
     bool operator() (const wchar_t* a, const wchar_t* b) const