diff options
author | bunnei <bunneidev@gmail.com> | 2018-08-12 16:22:35 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-12 16:22:35 -0400 |
commit | 424e90f0f5e05fb34cfc728b9e12fbfc66ab2fdf (patch) | |
tree | e6d7cb41890e1ef6848ffe046602b9f4b526e291 /src | |
parent | e12a07079e217bd389f117876a4cb3359cdee333 (diff) | |
parent | 98b940052c92d509192e6810666fa655ea7682cd (diff) |
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 @@ #include "core/file_sys/vfs.h" namespace Loader { -enum class ResultStatus; +enum class ResultStatus : u16; } 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 @@ #include "partition_filesystem.h" namespace Loader { -enum class ResultStatus; +enum class ResultStatus : u16; } 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{ }; std::string GetMessageForResultStatus(ResultStatus status) { - return GetMessageForResultStatus(static_cast<size_t>(status)); + return GetMessageForResultStatus(static_cast<u16>(status)); } 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); std::string GetFileTypeString(FileType type); /// Return type for functions in Loader namespace -enum class ResultStatus { +enum class ResultStatus : u16 { Success, ErrorAlreadyLoaded, ErrorNotImplemented, |