From a1fb8a331fde52279f18ae3fe3a57d7d88ff526d Mon Sep 17 00:00:00 2001 From: David Marcec Date: Sun, 12 Aug 2018 13:31:15 +1000 Subject: Fixed invalid cast in loader GetMessageForResultStatus takes a u16, not a size_t. --- src/core/loader/loader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core') 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 RESULT_MESSAGES{ }; std::string GetMessageForResultStatus(ResultStatus status) { - return GetMessageForResultStatus(static_cast(status)); + return GetMessageForResultStatus(static_cast(status)); } std::string GetMessageForResultStatus(u16 status) { -- cgit v1.2.3 From 98b940052c92d509192e6810666fa655ea7682cd Mon Sep 17 00:00:00 2001 From: David Marcec Date: Sun, 12 Aug 2018 14:56:22 +1000 Subject: made ResultStatus a u16 --- src/core/file_sys/partition_filesystem.h | 2 +- src/core/file_sys/program_metadata.h | 2 +- src/core/loader/loader.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core') 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.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, -- cgit v1.2.3