diff options
author | Darshan Sen <raisinten@gmail.com> | 2021-06-12 17:12:04 +0300 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2021-06-14 18:19:51 +0300 |
commit | 940f2c2b4750d0647ffabd9cfe1c4bba09e639b6 (patch) | |
tree | 3e4953e120a2f8d694414c29bd1f7615d9fda544 /src | |
parent | 68229a9f08ea900979e38df0d6c2612e2197cfe1 (diff) |
src: refactor to use locale functions
This makes the code more readable.
Signed-off-by: Darshan Sen <raisinten@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/39014
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/inspector/node_string.cc | 4 | ||||
-rw-r--r-- | src/tracing/traced_value.cc | 2 | ||||
-rw-r--r-- | src/util-inl.h | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/inspector/node_string.cc b/src/inspector/node_string.cc index 0d403c66f01..4cb8b573cc1 100644 --- a/src/inspector/node_string.cc +++ b/src/inspector/node_string.cc @@ -71,14 +71,14 @@ String StringViewToUtf8(v8_inspector::StringView view) { String fromDouble(double d) { std::ostringstream stream; - stream.imbue(std::locale("C")); // Ignore locale + stream.imbue(std::locale::classic()); // Ignore current locale stream << d; return stream.str(); } double toDouble(const char* buffer, size_t length, bool* ok) { std::istringstream stream(std::string(buffer, length)); - stream.imbue(std::locale("C")); // Ignore locale + stream.imbue(std::locale::classic()); // Ignore current locale double d; stream >> d; *ok = !stream.fail(); diff --git a/src/tracing/traced_value.cc b/src/tracing/traced_value.cc index dfc11658e7e..662b0357a19 100644 --- a/src/tracing/traced_value.cc +++ b/src/tracing/traced_value.cc @@ -94,7 +94,7 @@ std::string DoubleToCString(double v) { default: // This is a far less sophisticated version than the one used inside v8. std::ostringstream stream; - stream.imbue(std::locale("C")); // Ignore locale + stream.imbue(std::locale::classic()); // Ignore current locale stream << v; return stream.str(); } diff --git a/src/util-inl.h b/src/util-inl.h index 00a9f836e46..517da707170 100644 --- a/src/util-inl.h +++ b/src/util-inl.h @@ -26,6 +26,7 @@ #include <cmath> #include <cstring> +#include <locale> #include "util.h" // These are defined by <sys/byteorder.h> or <netinet/in.h> on some systems. @@ -274,7 +275,7 @@ void SwapBytes64(char* data, size_t nbytes) { } char ToLower(char c) { - return c >= 'A' && c <= 'Z' ? c + ('a' - 'A') : c; + return std::tolower(c, std::locale::classic()); } std::string ToLower(const std::string& in) { @@ -285,7 +286,7 @@ std::string ToLower(const std::string& in) { } char ToUpper(char c) { - return c >= 'a' && c <= 'z' ? (c - 'a') + 'A' : c; + return std::toupper(c, std::locale::classic()); } std::string ToUpper(const std::string& in) { |