Merge c53a932 into 96aa95e

OpenLightingProject · Aug 21, 2023 · d8c901e · d8c901e
2 parents 96aa95e + c53a932
commit d8c901e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/common/utils/StringUtils.cpp b/common/utils/StringUtils.cpp
@@ -403,12 +403,12 @@ bool HexStringToInt(const string &value, int32_t *output) {
 
 void ToLower(string *s) {
   std::transform(s->begin(), s->end(), s->begin(),
-                 std::ptr_fun<int, int>(std::tolower));
+                 [](int value){return std::tolower(value);});
 }
 
 void ToUpper(string *s) {
   std::transform(s->begin(), s->end(), s->begin(),
-                 std::ptr_fun<int, int>(std::toupper));
+                 [](int value){return std::toupper(value);});
 }
 
 void CapitalizeLabel(string *s) {

diff --git a/include/ola/ExportMap.h b/include/ola/ExportMap.h
@@ -77,8 +77,7 @@ class BaseVariable {
   std::string m_name;
 };
 
-struct VariableLessThan: public std::binary_function<BaseVariable*,
-                                                     BaseVariable*, bool> {
+struct VariableLessThan {
   bool operator()(BaseVariable *x, BaseVariable *y) {
     return x->Name() < y->Name();
   }

diff --git a/include/olad/Plugin.h b/include/olad/Plugin.h
@@ -107,8 +107,7 @@ class AbstractPlugin {
 };
 
 
-struct PluginLessThan: public std::binary_function<AbstractPlugin*,
-                                                   AbstractPlugin*, bool> {
+struct PluginLessThan {
   bool operator()(AbstractPlugin *x, AbstractPlugin *y) {
     return x->Id() < y->Id();
   }