summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2017-12-14 06:45:12 -0800
committerMinh Nguyễn <mxn@1ec5.org>2017-12-14 06:47:08 -0800
commitee049f8ace92eff4e7e1fdca2cff6f040821e3a7 (patch)
treeb45b45992a13a31b67ad75581e47eb9afdf4603f
parentf545d21df0d9a5b29b902bacee8dadf48ab11493 (diff)
downloadqtlocation-mapboxgl-upstream/1ec5-konami-case-10699.tar.gz
[core] Migrated upcase, downcase to platform codeupstream/1ec5-konami-case-10699
Replaced manual, per-character upper- and lowercasing code with calls to platform-specific code that affects a wider range of characters.
-rw-r--r--src/mbgl/style/expression/compound_expression.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/mbgl/style/expression/compound_expression.cpp b/src/mbgl/style/expression/compound_expression.cpp
index fa79357560..70bc6dfd95 100644
--- a/src/mbgl/style/expression/compound_expression.cpp
+++ b/src/mbgl/style/expression/compound_expression.cpp
@@ -5,6 +5,7 @@
#include <mbgl/math/log2.hpp>
#include <mbgl/util/ignore.hpp>
#include <mbgl/util/string.hpp>
+#include <mbgl/util/platform.hpp>
namespace mbgl {
namespace style {
@@ -397,16 +398,10 @@ std::unordered_map<std::string, CompoundExpressionRegistry::Definition> initiali
define("!", [](bool e) -> Result<bool> { return !e; });
define("upcase", [](const std::string& input) -> Result<std::string> {
- std::string s = input;
- std::transform(s.begin(), s.end(), s.begin(),
- [](unsigned char c){ return std::toupper(c); });
- return s;
+ return platform::uppercase(input);
});
define("downcase", [](const std::string& input) -> Result<std::string> {
- std::string s = input;
- std::transform(s.begin(), s.end(), s.begin(),
- [](unsigned char c){ return std::tolower(c); });
- return s;
+ return platform::lowercase(input);
});
define("concat", [](const Varargs<std::string>& args) -> Result<std::string> {
std::string s;