diff options
| author | hrydgard <hrydgard@gmail.com> | 2009-02-28 01:26:56 +0000 |
|---|---|---|
| committer | hrydgard <hrydgard@gmail.com> | 2009-02-28 01:26:56 +0000 |
| commit | 4bdb4aa0d1c8520488583ba79c9f5ab6e5656eca (patch) | |
| tree | 05cb77888380f7814d96b356c8f538bb736799fa /Source/Core/Common/Src/StringUtil.cpp | |
| parent | 2783f24cfeb39731c5e41fe73ec40d36b266b467 (diff) | |
Merge large parts of nakeee's "Soap" branch into trunk, after fixing a few crash bugs in FileUtil.cpp.
Not really anything interesting, just some better comments, some slightly more portable/cleaner code in places.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2459 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common/Src/StringUtil.cpp')
| -rw-r--r-- | Source/Core/Common/Src/StringUtil.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/Common/Src/StringUtil.cpp b/Source/Core/Common/Src/StringUtil.cpp index edfbe3a282..483a704aee 100644 --- a/Source/Core/Common/Src/StringUtil.cpp +++ b/Source/Core/Common/Src/StringUtil.cpp @@ -80,10 +80,10 @@ u32 Ascii2Hex(std::string _Text) if (Length > 4) Length = 4; - for (int i = 0; i < Length; i++) + for (int i = 0; i < (int)Length; i++) { // Add up the values, for example RSPE becomes, 0x52000000, then 0x52530000 and so on - Result += _Text.c_str()[i] << (Length - 1 - i)*8; + Result += _Text.c_str()[i] << ((Length - 1 - i) * 8); } // Return the value return Result; |