summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Locatti <reinuseslisp@airmail.cc>2019-11-13 20:26:34 +0100
committerGitHub <noreply@github.com>2019-11-13 20:26:34 +0100
commitcc9e68202108affae6354a983851bfef1892bab3 (patch)
tree697c8537d7b8d5a6ebbdb785fd2a395bf6391ded
parentMerge pull request #3084 from ReinUsesLisp/cast-warnings (diff)
parentcommon_funcs: silence sign-conversion warnings in MakeMagic() (diff)
downloadyuzu-cc9e68202108affae6354a983851bfef1892bab3.tar
yuzu-cc9e68202108affae6354a983851bfef1892bab3.tar.gz
yuzu-cc9e68202108affae6354a983851bfef1892bab3.tar.bz2
yuzu-cc9e68202108affae6354a983851bfef1892bab3.tar.lz
yuzu-cc9e68202108affae6354a983851bfef1892bab3.tar.xz
yuzu-cc9e68202108affae6354a983851bfef1892bab3.tar.zst
yuzu-cc9e68202108affae6354a983851bfef1892bab3.zip
-rw-r--r--src/common/common_funcs.h2
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();
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