aboutsummaryrefslogtreecommitdiff
path: root/src/core/hle/service/cfg/cfg.cpp
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2017-06-18 19:03:15 -0700
committerYuri Kunde Schlesner <yuriks@yuriks.net>2017-06-18 19:03:15 -0700
commit723dc644faa6e29250d1b7fa914dfb7c75d8aec5 (patch)
treec7ad927e2cbe1424046e279b3212ac895f4b1e87 /src/core/hle/service/cfg/cfg.cpp
parent4cb47b027888de95aa0d432338909b65b33feec7 (diff)
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/cfg/cfg.cpp')
-rw-r--r--src/core/hle/service/cfg/cfg.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp
index 5a7878b31..6624f1711 100644
--- a/src/core/hle/service/cfg/cfg.cpp
+++ b/src/core/hle/service/cfg/cfg.cpp
@@ -406,7 +406,7 @@ ResultCode UpdateConfigNANDSavegame() {
auto config_result = Service::FS::OpenFileFromArchive(cfg_system_save_data_archive, path, mode);
ASSERT_MSG(config_result.Succeeded(), "could not open file");
- auto config = config_result.MoveFrom();
+ auto config = std::move(config_result).Unwrap();
config->backend->Write(0, CONFIG_SAVEFILE_SIZE, 1, cfg_config_file_buffer.data());
return RESULT_SUCCESS;
@@ -560,7 +560,7 @@ ResultCode LoadConfigNANDSaveFile() {
// Read the file if it already exists
if (config_result.Succeeded()) {
- auto config = config_result.MoveFrom();
+ auto config = std::move(config_result).Unwrap();
config->backend->Read(0, CONFIG_SAVEFILE_SIZE, cfg_config_file_buffer.data());
return RESULT_SUCCESS;
}