summaryrefslogtreecommitdiffstats
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
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
-rw-r--r--src/akiru/src/akiru.cpp2
-rw-r--r--src/common/src/file_util.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/akiru/src/akiru.cpp b/src/akiru/src/akiru.cpp
index 3185c2f95..a31b6fbca 100644
--- a/src/akiru/src/akiru.cpp
+++ b/src/akiru/src/akiru.cpp
@@ -37,7 +37,7 @@
/// Application entry point
int __cdecl main(int argc, char **argv) {
- u32 tight_loop;
+ //u32 tight_loop;
printf("akiru starting...\n");
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());
}