diff options
| author |  Rodrigo Locatti | 2019-11-13 16:26:34 -0300 |
|---|---|---|
| committer |  GitHub | 2019-11-13 16:26:34 -0300 |
| commit | cc9e68202108affae6354a983851bfef1892bab3 (patch) | |
| tree | 697c8537d7b8d5a6ebbdb785fd2a395bf6391ded | |
| parent | Merge pull request #3084 from ReinUsesLisp/cast-warnings (diff) | |
| parent | common_funcs: silence sign-conversion warnings in MakeMagic() (diff) | |
| download | yuzu-cc9e68202108affae6354a983851bfef1892bab3.tar.gz yuzu-cc9e68202108affae6354a983851bfef1892bab3.tar.xz yuzu-cc9e68202108affae6354a983851bfef1892bab3.zip | |
Merge pull request #3103 from lioncash/cfunc
common_funcs: silence sign-conversion warnings in MakeMagic()
Diffstat (limited to '')
| -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 c029dc7b3..6dc3e108f 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h | |||
| @@ -56,7 +56,7 @@ std::string GetLastErrorMsg(); | |||
| 56 | namespace Common { | 56 | namespace Common { |
| 57 | 57 | ||
| 58 | constexpr u32 MakeMagic(char a, char b, char c, char d) { | 58 | constexpr u32 MakeMagic(char a, char b, char c, char d) { |
| 59 | return a | b << 8 | c << 16 | d << 24; | 59 | return u32(a) | u32(b) << 8 | u32(c) << 16 | u32(d) << 24; |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | } // namespace Common | 62 | } // namespace Common |