summaryrefslogtreecommitdiff
path: root/src/core/hle/service/ptm
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2017-06-18 19:03:15 -0700
committerGravatar Yuri Kunde Schlesner2017-06-18 19:03:15 -0700
commit723dc644faa6e29250d1b7fa914dfb7c75d8aec5 (patch)
treec7ad927e2cbe1424046e279b3212ac895f4b1e87 /src/core/hle/service/ptm
parentResultVal: Add an rvalue overload of Unwrap() (diff)
downloadyuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.gz
yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.tar.xz
yuzu-723dc644faa6e29250d1b7fa914dfb7c75d8aec5.zip
ResultVal: Remove MoveFrom()
Replace it with std::move(result_val).Unwrap(), or Foo().Unwrap() in case you already have an rvalue.
Diffstat (limited to 'src/core/hle/service/ptm')
-rw-r--r--src/core/hle/service/ptm/ptm.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/service/ptm/ptm.cpp b/src/core/hle/service/ptm/ptm.cpp
index 39382ef09..a0b959797 100644
--- a/src/core/hle/service/ptm/ptm.cpp
+++ b/src/core/hle/service/ptm/ptm.cpp
@@ -152,7 +152,7 @@ void Init() {
152 auto gamecoin_result = 152 auto gamecoin_result =
153 Service::FS::OpenFileFromArchive(*archive_result, gamecoin_path, open_mode); 153 Service::FS::OpenFileFromArchive(*archive_result, gamecoin_path, open_mode);
154 if (gamecoin_result.Succeeded()) { 154 if (gamecoin_result.Succeeded()) {
155 auto gamecoin = gamecoin_result.MoveFrom(); 155 auto gamecoin = std::move(gamecoin_result).Unwrap();
156 gamecoin->backend->Write(0, sizeof(GameCoin), true, 156 gamecoin->backend->Write(0, sizeof(GameCoin), true,
157 reinterpret_cast<const u8*>(&default_game_coin)); 157 reinterpret_cast<const u8*>(&default_game_coin));
158 gamecoin->backend->Close(); 158 gamecoin->backend->Close();