diff options
| author | 2018-08-12 16:22:35 -0400 | |
|---|---|---|
| committer | 2018-08-12 16:22:35 -0400 | |
| commit | 424e90f0f5e05fb34cfc728b9e12fbfc66ab2fdf (patch) | |
| tree | e6d7cb41890e1ef6848ffe046602b9f4b526e291 /src | |
| parent | Merge pull request #1038 from MerryMage/lock-cubeb (diff) | |
| parent | made ResultStatus a u16 (diff) | |
| download | yuzu-424e90f0f5e05fb34cfc728b9e12fbfc66ab2fdf.tar.gz yuzu-424e90f0f5e05fb34cfc728b9e12fbfc66ab2fdf.tar.xz yuzu-424e90f0f5e05fb34cfc728b9e12fbfc66ab2fdf.zip | |
Merge pull request #1025 from ogniK5377/bad-cast
Fixed invalid cast in loader
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/file_sys/partition_filesystem.h | 2 | ||||
| -rw-r--r-- | src/core/file_sys/program_metadata.h | 2 | ||||
| -rw-r--r-- | src/core/loader/loader.cpp | 2 | ||||
| -rw-r--r-- | src/core/loader/loader.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/core/file_sys/partition_filesystem.h b/src/core/file_sys/partition_filesystem.h index 7c7a75816..be7bc32a8 100644 --- a/src/core/file_sys/partition_filesystem.h +++ b/src/core/file_sys/partition_filesystem.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include "core/file_sys/vfs.h" | 13 | #include "core/file_sys/vfs.h" |
| 14 | 14 | ||
| 15 | namespace Loader { | 15 | namespace Loader { |
| 16 | enum class ResultStatus; | 16 | enum class ResultStatus : u16; |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | namespace FileSys { | 19 | namespace FileSys { |
diff --git a/src/core/file_sys/program_metadata.h b/src/core/file_sys/program_metadata.h index 06a7315db..74a91052b 100644 --- a/src/core/file_sys/program_metadata.h +++ b/src/core/file_sys/program_metadata.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include "partition_filesystem.h" | 13 | #include "partition_filesystem.h" |
| 14 | 14 | ||
| 15 | namespace Loader { | 15 | namespace Loader { |
| 16 | enum class ResultStatus; | 16 | enum class ResultStatus : u16; |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | namespace FileSys { | 19 | namespace FileSys { |
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 2f5bfc67c..1f2f31535 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp | |||
| @@ -126,7 +126,7 @@ constexpr std::array<const char*, 36> RESULT_MESSAGES{ | |||
| 126 | }; | 126 | }; |
| 127 | 127 | ||
| 128 | std::string GetMessageForResultStatus(ResultStatus status) { | 128 | std::string GetMessageForResultStatus(ResultStatus status) { |
| 129 | return GetMessageForResultStatus(static_cast<size_t>(status)); | 129 | return GetMessageForResultStatus(static_cast<u16>(status)); |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | std::string GetMessageForResultStatus(u16 status) { | 132 | std::string GetMessageForResultStatus(u16 status) { |
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index cfdadbee3..285363549 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h | |||
| @@ -56,7 +56,7 @@ FileType GuessFromFilename(const std::string& name); | |||
| 56 | std::string GetFileTypeString(FileType type); | 56 | std::string GetFileTypeString(FileType type); |
| 57 | 57 | ||
| 58 | /// Return type for functions in Loader namespace | 58 | /// Return type for functions in Loader namespace |
| 59 | enum class ResultStatus { | 59 | enum class ResultStatus : u16 { |
| 60 | Success, | 60 | Success, |
| 61 | ErrorAlreadyLoaded, | 61 | ErrorAlreadyLoaded, |
| 62 | ErrorNotImplemented, | 62 | ErrorNotImplemented, |