From 723dc644faa6e29250d1b7fa914dfb7c75d8aec5 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sun, 18 Jun 2017 19:03:15 -0700 Subject: ResultVal: Remove MoveFrom() Replace it with std::move(result_val).Unwrap(), or Foo().Unwrap() in case you already have an rvalue. --- src/core/hle/service/fs/archive.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/hle/service/fs/archive.cpp') 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> OpenFileFromArchive(ArchiveHandle archive_handl if (backend.Failed()) return backend.Code(); - auto file = std::shared_ptr(new File(backend.MoveFrom(), path)); + auto file = std::shared_ptr(new File(std::move(backend).Unwrap(), path)); return MakeResult>(std::move(file)); } @@ -401,7 +401,7 @@ ResultVal> OpenDirectoryFromArchive(ArchiveHandle arc if (backend.Failed()) return backend.Code(); - auto directory = std::shared_ptr(new Directory(backend.MoveFrom(), path)); + auto directory = std::shared_ptr(new Directory(std::move(backend).Unwrap(), path)); return MakeResult>(std::move(directory)); } -- cgit v1.2.3