diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-06-19 04:03:15 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-06-19 04:03:15 +0200 |
commit | 723dc644faa6e29250d1b7fa914dfb7c75d8aec5 (patch) | |
tree | c7ad927e2cbe1424046e279b3212ac895f4b1e87 /src/core/hle/service/fs/archive.cpp | |
parent | ResultVal: Add an rvalue overload of Unwrap() (diff) | |
download | yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.gz yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.bz2 yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.lz yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.xz yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.zst yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.zip |
Diffstat (limited to 'src/core/hle/service/fs/archive.cpp')
-rw-r--r-- | src/core/hle/service/fs/archive.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp index 3605ef175..033fbc9aa 100644 --- a/src/core/hle/service/fs/archive.cpp +++ b/src/core/hle/service/fs/archive.cpp @@ -311,7 +311,7 @@ ResultVal<std::shared_ptr<File>> OpenFileFromArchive(ArchiveHandle archive_handl if (backend.Failed()) return backend.Code(); - auto file = std::shared_ptr<File>(new File(backend.MoveFrom(), path)); + auto file = std::shared_ptr<File>(new File(std::move(backend).Unwrap(), path)); return MakeResult<std::shared_ptr<File>>(std::move(file)); } @@ -401,7 +401,7 @@ ResultVal<std::shared_ptr<Directory>> OpenDirectoryFromArchive(ArchiveHandle arc if (backend.Failed()) return backend.Code(); - auto directory = std::shared_ptr<Directory>(new Directory(backend.MoveFrom(), path)); + auto directory = std::shared_ptr<Directory>(new Directory(std::move(backend).Unwrap(), path)); return MakeResult<std::shared_ptr<Directory>>(std::move(directory)); } |