Browse Source
Merge pull request #1025 from ogniK5377/bad-cast
Fixed invalid cast in loader
pull/15/merge
bunnei
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
4 additions and
4 deletions
-
src/core/file_sys/partition_filesystem.h
-
src/core/file_sys/program_metadata.h
-
src/core/loader/loader.cpp
-
src/core/loader/loader.h
|
|
|
@ -13,7 +13,7 @@ |
|
|
|
#include "core/file_sys/vfs.h" |
|
|
|
|
|
|
|
namespace Loader { |
|
|
|
enum class ResultStatus; |
|
|
|
enum class ResultStatus : u16; |
|
|
|
} |
|
|
|
|
|
|
|
namespace FileSys { |
|
|
|
|
|
|
|
@ -13,7 +13,7 @@ |
|
|
|
#include "partition_filesystem.h" |
|
|
|
|
|
|
|
namespace Loader { |
|
|
|
enum class ResultStatus; |
|
|
|
enum class ResultStatus : u16; |
|
|
|
} |
|
|
|
|
|
|
|
namespace FileSys { |
|
|
|
|
|
|
|
@ -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) { |
|
|
|
|
|
|
|
@ -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, |
|
|
|
|