mirror of
https://github.com/p-ranav/indicators.git
synced 2025-12-16 04:18:51 +08:00
Merge pull request #142 from CodingRookie98/master
Fix Localization Information Restoration Issue: Change setlocale(LC_ALL, "") to setlocale(LC_ALL, NULL)
This commit is contained in:
@@ -311,7 +311,7 @@ static inline int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n) {
|
|||||||
// convert UTF-8 string to wstring
|
// convert UTF-8 string to wstring
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
static inline std::wstring utf8_decode(const std::string& s) {
|
static inline std::wstring utf8_decode(const std::string& s) {
|
||||||
auto r = setlocale(LC_ALL, "");
|
auto r = setlocale(LC_ALL, NULL);
|
||||||
std::string curLocale;
|
std::string curLocale;
|
||||||
if (r)
|
if (r)
|
||||||
curLocale = r;
|
curLocale = r;
|
||||||
@@ -327,7 +327,7 @@ static inline std::wstring utf8_decode(const std::string& s) {
|
|||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
static inline std::wstring utf8_decode(const std::string& s) {
|
static inline std::wstring utf8_decode(const std::string& s) {
|
||||||
auto r = setlocale(LC_ALL, "");
|
auto r = setlocale(LC_ALL, NULL);
|
||||||
std::string curLocale;
|
std::string curLocale;
|
||||||
if (r)
|
if (r)
|
||||||
curLocale = r;
|
curLocale = r;
|
||||||
|
|||||||
Reference in New Issue
Block a user