summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2015-02-01 21:31:21 +0100
committerSubv <subv2112@gmail.com>2015-02-12 15:25:35 +0100
commit8e2b248e05c99c9cf505a351bc9234cedd5fa3b4 (patch)
tree05f18714a93d28999c259f4cd86c261deaf659b2 /src/common
parentMerge pull request #384 from neobrain/vertex_shader_debugger (diff)
downloadyuzu-8e2b248e05c99c9cf505a351bc9234cedd5fa3b4.tar
yuzu-8e2b248e05c99c9cf505a351bc9234cedd5fa3b4.tar.gz
yuzu-8e2b248e05c99c9cf505a351bc9234cedd5fa3b4.tar.bz2
yuzu-8e2b248e05c99c9cf505a351bc9234cedd5fa3b4.tar.lz
yuzu-8e2b248e05c99c9cf505a351bc9234cedd5fa3b4.tar.xz
yuzu-8e2b248e05c99c9cf505a351bc9234cedd5fa3b4.tar.zst
yuzu-8e2b248e05c99c9cf505a351bc9234cedd5fa3b4.zip
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 b3b772bd9..3264dd51a 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;