Browse Source
Merge pull request #3103 from lioncash/cfunc
common_funcs: silence sign-conversion warnings in MakeMagic()
pull/15/merge
Rodrigo Locatti
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
1 deletions
-
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 |