summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorShizZy <shizzy@6bit.net>2013-09-09 03:55:37 +0200
committerShizZy <shizzy@6bit.net>2013-09-09 03:55:37 +0200
commit4f5d3973797c186ae3bc7d7aabae19725a49443e (patch)
treee57f4cdf6ebc1ebd616d7bba3ad4f8a5afa0188f /src/common
parent removed unneeded dolphin paths code, fixed linker problems with common.lib (diff)
downloadyuzu-4f5d3973797c186ae3bc7d7aabae19725a49443e.tar
yuzu-4f5d3973797c186ae3bc7d7aabae19725a49443e.tar.gz
yuzu-4f5d3973797c186ae3bc7d7aabae19725a49443e.tar.bz2
yuzu-4f5d3973797c186ae3bc7d7aabae19725a49443e.tar.lz
yuzu-4f5d3973797c186ae3bc7d7aabae19725a49443e.tar.xz
yuzu-4f5d3973797c186ae3bc7d7aabae19725a49443e.tar.zst
yuzu-4f5d3973797c186ae3bc7d7aabae19725a49443e.zip
Diffstat (limited to 'src/common')
-rw-r--r--src/common/src/file_util.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/src/file_util.cpp b/src/common/src/file_util.cpp
index 6a7f92754..76927c3bc 100644
--- a/src/common/src/file_util.cpp
+++ b/src/common/src/file_util.cpp
@@ -781,7 +781,7 @@ bool ReadFileToString(bool text_file, const char *filename, std::string &str)
if (!f)
return false;
- str.resize(GetSize(f));
+ str.resize(static_cast<u32>(GetSize(f)));
return file.ReadArray(&str[0], str.size());
}