AxioDL
/
nod
mirror of https://github.com/AxioDL/nod.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

string conversion fix for windows

This commit is contained in:
Jack Andersen 2015-08-31 11:43:23 -10:00
parent 799e2cb6ee
commit 960ba8e462
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/NOD/Util.hpp
View File

@ -50,7 +50,7 @@ public:
SystemUTF8View(const SystemString& str) SystemUTF8View(const SystemString& str)
{ {
int len = WideCharToMultiByte(CP_UTF8, 0, str.c_str(), str.size(), nullptr, 0, nullptr, nullptr); int len = WideCharToMultiByte(CP_UTF8, 0, str.c_str(), str.size(), nullptr, 0, nullptr, nullptr);
m_utf8.assign('\0', len); m_utf8.assign(len, '\0');
WideCharToMultiByte(CP_UTF8, 0, str.c_str(), str.size(), &m_utf8[0], len, nullptr, nullptr); WideCharToMultiByte(CP_UTF8, 0, str.c_str(), str.size(), &m_utf8[0], len, nullptr, nullptr);
} }
inline const std::string& utf8_str() {return m_utf8;} inline const std::string& utf8_str() {return m_utf8;}
@ -62,7 +62,7 @@ public:
SystemStringView(const std::string& str) SystemStringView(const std::string& str)
{ {
int len = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), str.size(), nullptr, 0); int len = MultiByteToWideChar(CP_UTF8, 0, str.c_str(), str.size(), nullptr, 0);
m_sys.assign(L'\0', len); m_sys.assign(len, L'\0');
MultiByteToWideChar(CP_UTF8, 0, str.c_str(), str.size(), &m_sys[0], len); MultiByteToWideChar(CP_UTF8, 0, str.c_str(), str.size(), &m_sys[0], len);
} }
inline const std::wstring& sys_str() {return m_sys;} inline const std::wstring& sys_str() {return m_sys;}