1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
--- src/FbTk/StringUtil.cc.orig 2008-06-14 17:36:06.000000000 +0000
+++ src/FbTk/StringUtil.cc 2008-06-14 17:39:56.000000000 +0000
@@ -23,6 +23,9 @@
#include "StringUtil.hh"
+
+#include <cstring>
+#include <locale>
#include <string>
#include <cstdio>
#include <cstdlib>
@@ -37,6 +40,26 @@
namespace StringUtil {
+
+/*
+ * structs needed for std::transform()
+ * See: http://gcc.gnu.org/onlinedocs/libstdc++/22_locale/howto.html#7
+ */
+struct ToUpper {
+ ToUpper(std::locale const& l) : loc(l) {;}
+ char operator() (char c) const { return std::toupper(c,loc); }
+ private:
+ std::locale const& loc;
+};
+
+struct ToLower {
+ ToLower(std::locale const& l) : loc(l) {;}
+ char operator() (char c) const { return std::tolower(c,loc); }
+private:
+ std::locale const& loc;
+};
+
+
/**
Takes a pointer to string *s as an argument,
creates a new string n, copies s to n and
@@ -160,14 +183,20 @@
}
std::string toLower(const std::string &conv) {
+
+ ToLower __tolower(std::locale::classic());
+
std::string ret = conv;
- std::transform(ret.begin(), ret.end(), ret.begin(), tolower);
+ std::transform(ret.begin(), ret.end(), ret.begin(), __tolower);
return ret;
}
std::string toUpper(const std::string &conv) {
+
+ ToUpper __toupper(std::locale::classic());
+
std::string ret = conv;
- std::transform(ret.begin(), ret.end(), ret.begin(), toupper);
+ std::transform(ret.begin(), ret.end(), ret.begin(), __toupper);
return ret;
}
|
GitWeb
