diff options
| author | 2016-03-21 10:44:37 -0400 | |
|---|---|---|
| committer | 2016-03-21 10:44:37 -0400 | |
| commit | 8986aa181d7dd85600e53fe33aa672c4d5619abd (patch) | |
| tree | 95e0ac7e418472020d95f08c38adbc9b221f0d91 /src/core/loader | |
| parent | Merge pull request #1302 from Subv/save_fix (diff) | |
| parent | session: Make helper functions constexpr (diff) | |
| download | yuzu-8986aa181d7dd85600e53fe33aa672c4d5619abd.tar.gz yuzu-8986aa181d7dd85600e53fe33aa672c4d5619abd.tar.xz yuzu-8986aa181d7dd85600e53fe33aa672c4d5619abd.zip | |
Merge pull request #1562 from lioncash/constexpr
core: Mark some helper functions as constexpr
Diffstat (limited to 'src/core/loader')
| -rw-r--r-- | src/core/loader/loader.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index a7f2715ba..84a4ce5fc 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h | |||
| @@ -74,7 +74,7 @@ enum class ResultStatus { | |||
| 74 | ErrorEncrypted, | 74 | ErrorEncrypted, |
| 75 | }; | 75 | }; |
| 76 | 76 | ||
| 77 | static inline u32 MakeMagic(char a, char b, char c, char d) { | 77 | constexpr u32 MakeMagic(char a, char b, char c, char d) { |
| 78 | return a | b << 8 | c << 16 | d << 24; | 78 | return a | b << 8 | c << 16 | d << 24; |
| 79 | } | 79 | } |
| 80 | 80 | ||