diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-06-21 07:04:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 07:04:09 +0200 |
| commit | b21dfbb2956698b05104bc68c0b08ade0d671fd8 (patch) | |
| tree | 2f39f319f1391d4be12e50d1504c2bfc06b35cc2 /src/core/hle/service/fs/archive.cpp | |
| parent | Merge pull request #2779 from Subv/uds_more2 (diff) | |
| parent | ResultVal: Remove MoveFrom() (diff) | |
| download | yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar.gz yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar.bz2 yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar.lz yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar.xz yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.tar.zst yuzu-b21dfbb2956698b05104bc68c0b08ade0d671fd8.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)); } |