diff options
author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2019-11-13 16:26:34 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-13 16:26:34 -0300 |
commit | cc9e68202108affae6354a983851bfef1892bab3 (patch) | |
tree | 697c8537d7b8d5a6ebbdb785fd2a395bf6391ded /src | |
parent | cf770a68a528cdb7f3a5483f6d17eeb924e37b7e (diff) | |
parent | 61f6eaad451652e779bb056786c1d6650d1fd7f5 (diff) |
Merge pull request #3103 from lioncash/cfunc
common_funcs: silence sign-conversion warnings in MakeMagic()
Diffstat (limited to 'src')
-rw-r--r-- | src/common/common_funcs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index c029dc7b3f..6dc3e108f4 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -56,7 +56,7 @@ std::string GetLastErrorMsg(); namespace Common { constexpr u32 MakeMagic(char a, char b, char c, char d) { - return a | b << 8 | c << 16 | d << 24; + return u32(a) | u32(b) << 8 | u32(c) << 16 | u32(d) << 24; } } // namespace Common |