diff options
| author | bunnei <bunneidev@gmail.com> | 2023-08-09 21:24:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-09 21:24:31 -0700 |
| commit | 9d3a293a4ea17b60146c10e7561c0fd1219fd6c1 (patch) | |
| tree | b69936f3e53ee675de0ca21a1dffabd7e71acae0 /src/core/file_sys/romfs_factory.h | |
| parent | 3d6ce9dd2b5bad115b295fb7092abc5c30a34448 (diff) | |
| parent | 1e394c6cdf1ab83c83477c19c0e736a95b86e8da (diff) | |
Merge pull request #11093 from liamwhite/result-ergonomics
core: remove ResultVal type
Diffstat (limited to 'src/core/file_sys/romfs_factory.h')
| -rw-r--r-- | src/core/file_sys/romfs_factory.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/core/file_sys/romfs_factory.h b/src/core/file_sys/romfs_factory.h index 14936031f..7ec40d19d 100644 --- a/src/core/file_sys/romfs_factory.h +++ b/src/core/file_sys/romfs_factory.h @@ -41,13 +41,11 @@ public: ~RomFSFactory(); void SetPackedUpdate(VirtualFile update_raw_file); - [[nodiscard]] ResultVal<VirtualFile> OpenCurrentProcess(u64 current_process_title_id) const; - [[nodiscard]] ResultVal<VirtualFile> OpenPatchedRomFS(u64 title_id, - ContentRecordType type) const; - [[nodiscard]] ResultVal<VirtualFile> OpenPatchedRomFSWithProgramIndex( - u64 title_id, u8 program_index, ContentRecordType type) const; - [[nodiscard]] ResultVal<VirtualFile> Open(u64 title_id, StorageId storage, - ContentRecordType type) const; + [[nodiscard]] VirtualFile OpenCurrentProcess(u64 current_process_title_id) const; + [[nodiscard]] VirtualFile OpenPatchedRomFS(u64 title_id, ContentRecordType type) const; + [[nodiscard]] VirtualFile OpenPatchedRomFSWithProgramIndex(u64 title_id, u8 program_index, + ContentRecordType type) const; + [[nodiscard]] VirtualFile Open(u64 title_id, StorageId storage, ContentRecordType type) const; private: [[nodiscard]] std::shared_ptr<NCA> GetEntry(u64 title_id, StorageId storage, |