From ee049f8ace92eff4e7e1fdca2cff6f040821e3a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= Date: Thu, 14 Dec 2017 06:45:12 -0800 Subject: [core] Migrated upcase, downcase to platform code Replaced manual, per-character upper- and lowercasing code with calls to platform-specific code that affects a wider range of characters. --- src/mbgl/style/expression/compound_expression.cpp | 11 +++-------- 1 file 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 #include #include +#include namespace mbgl { namespace style { @@ -397,16 +398,10 @@ std::unordered_map initiali define("!", [](bool e) -> Result { return !e; }); define("upcase", [](const std::string& input) -> Result { - 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 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& args) -> Result { std::string s; -- cgit v1.2.1