diff options
| author |  ShizZy | 2013-09-08 21:55:37 -0400 |
|---|---|---|
| committer | ShizZy | 2013-09-08 21:55:37 -0400 |
| commit | 4f5d3973797c186ae3bc7d7aabae19725a49443e (patch) | |
| tree | e57f4cdf6ebc1ebd616d7bba3ad4f8a5afa0188f /src | |
| parent | removed unneeded dolphin paths code, fixed linker problems with common.lib (diff) | |
| download | yuzu-4f5d3973797c186ae3bc7d7aabae19725a49443e.tar.gz yuzu-4f5d3973797c186ae3bc7d7aabae19725a49443e.tar.xz yuzu-4f5d3973797c186ae3bc7d7aabae19725a49443e.zip | |
fixed some code warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/akiru/src/akiru.cpp | 2 | ||||
| -rw-r--r-- | src/common/src/file_util.cpp | 2 |
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 @@ | |||
| 37 | 37 | ||
| 38 | /// Application entry point | 38 | /// Application entry point |
| 39 | int __cdecl main(int argc, char **argv) { | 39 | int __cdecl main(int argc, char **argv) { |
| 40 | u32 tight_loop; | 40 | //u32 tight_loop; |
| 41 | 41 | ||
| 42 | printf("akiru starting...\n"); | 42 | printf("akiru starting...\n"); |
| 43 | 43 | ||
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) | |||
| 781 | if (!f) | 781 | if (!f) |
| 782 | return false; | 782 | return false; |
| 783 | 783 | ||
| 784 | str.resize(GetSize(f)); | 784 | str.resize(static_cast<u32>(GetSize(f))); |
| 785 | return file.ReadArray(&str[0], str.size()); | 785 | return file.ReadArray(&str[0], str.size()); |
| 786 | } | 786 | } |
| 787 | 787 | ||