aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/common
diff options
context:
space:
mode:
authorGravatar bunnei <bunneidev@gmail.com>2015-02-14 15:50:26 -0500
committerGravatar bunnei <bunneidev@gmail.com>2015-02-14 15:50:26 -0500
commit12181c8a64678e73281e893b6ba108d5a125c1aa (patch)
tree831883189eb5c846b619c20e22e1015c5c140c63 /src/common
parent29a9e4ac25504bee82f273184a1afcc88a3e61e1 (diff)
parent8e2b248e05c99c9cf505a351bc9234cedd5fa3b4 (diff)
Merge pull request #529 from Subv/master
Build: Fixed some warnings
Diffstat (limited to 'src/common')
-rw-r--r--src/common/string_util.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index b3b772bd..3264dd51 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -426,7 +426,7 @@ std::u16string UTF8ToUTF16(const std::string& input)
static std::string UTF16ToUTF8(const std::wstring& input)
{
- auto const size = WideCharToMultiByte(CP_UTF8, 0, input.data(), input.size(), nullptr, 0, nullptr, nullptr);
+ auto const size = WideCharToMultiByte(CP_UTF8, 0, input.data(), static_cast<int>(input.size()), nullptr, 0, nullptr, nullptr);
std::string output;
output.resize(size);
@@ -439,12 +439,12 @@ static std::string UTF16ToUTF8(const std::wstring& input)
static std::wstring CPToUTF16(u32 code_page, const std::string& input)
{
- auto const size = MultiByteToWideChar(code_page, 0, input.data(), input.size(), nullptr, 0);
+ auto const size = MultiByteToWideChar(code_page, 0, input.data(), static_cast<int>(input.size()), nullptr, 0);
std::wstring output;
output.resize(size);
- if (size == 0 || size != MultiByteToWideChar(code_page, 0, input.data(), input.size(), &output[0], output.size()))
+ if (size == 0 || size != MultiByteToWideChar(code_page, 0, input.data(), static_cast<int>(input.size()), &output[0], static_cast<int>(output.size())))
output.clear();
return output;