Simplified ToLower/ToUpper functions.

diff --git a/stglibs/common.lib/common.cpp b/stglibs/common.lib/common.cpp
index 2a26c5ae02893196b67b47d9001b14271dd56b8f..d0ff074c77e8a676db58ab3c542db6c7da18c729 100644 (file)
--- a/stglibs/common.lib/common.cpp
+++ b/stglibs/common.lib/common.cpp
@@ -47,6 +47,7 @@
 
 #include <iconv.h>
 
 
 #include <iconv.h>
 

+#include <algorithm>

 #include <cstdlib>
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
 #include <cstdarg>
 #include <cstdio>


@@ -856,20 +857,16 @@ std::string res(val);
 return TrimR(TrimL(res));
 }
 //---------------------------------------------------------------------------
 return TrimR(TrimL(res));
 }
 //---------------------------------------------------------------------------

-std::string ToLower(const std::string & value)
+std::string ToLower(std::string value)

 {
 {

-    std::string res;
-    for (std::string::size_type pos = 0; pos < value.length(); ++pos)
-        res += tolower(value[pos]);
-    return res;
+    std::transform(value.begin(), value.end(), value.begin(), ::tolower);
+    return value;

 }
 //---------------------------------------------------------------------------
 }
 //---------------------------------------------------------------------------

-std::string ToUpper(const std::string & value)
+std::string ToUpper(std::string value)

 {
 {

-    std::string res;
-    for (std::string::size_type pos = 0; pos < value.length(); ++pos)
-        res += toupper(value[pos]);
-    return res;
+    std::transform(value.begin(), value.end(), value.begin(), ::toupper);
+    return value;

 }
 //---------------------------------------------------------------------------
 #ifdef WIN32
 }
 //---------------------------------------------------------------------------
 #ifdef WIN32

diff --git a/stglibs/common.lib/include/stg/common.h b/stglibs/common.lib/include/stg/common.h
index ec05adb124e2d3018a3ac4bcb964da44cabd54e0..90bd639d46dd56f8d71c445ec262a1dbba42a72c 100644 (file)
--- a/stglibs/common.lib/include/stg/common.h
+++ b/stglibs/common.lib/include/stg/common.h
@@ -99,8 +99,8 @@ std::string &   TrimR(std::string & val);
 std::string &   Trim(std::string & val);
 std::string     Trim(const std::string & val);
 
 std::string &   Trim(std::string & val);
 std::string     Trim(const std::string & val);
 

-std::string     ToLower(const std::string & value);
-std::string     ToUpper(const std::string & value);
+std::string     ToLower(std::string value);
+std::string     ToUpper(std::string value);

 
 template <typename C, typename F>
 inline
 
 template <typename C, typename F>
 inline