diff options
| author | LC <mathew1800@gmail.com> | 2020-06-19 15:17:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-19 15:17:04 -0400 |
| commit | 7883f38d30e7bd1997da8e5fac7fcf8a2aba03bf (patch) | |
| tree | 0717f95e8beda4396b754330a77a427793a387ac /src | |
| parent | 8ccd0aa8af92923633efe13f12374fe5f0e97753 (diff) | |
| parent | b26ff8fa866032940b7ad00a3b067993effcba6f (diff) | |
Merge pull request #4114 from MerryMage/nrvo
Remove redundant moves
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/file_sys/system_archive/mii_model.cpp | 2 | ||||
| -rw-r--r-- | src/input_common/keyboard.cpp | 2 | ||||
| -rw-r--r-- | src/input_common/motion_emu.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/file_sys/system_archive/mii_model.cpp b/src/core/file_sys/system_archive/mii_model.cpp index 6a9add87c6..61bb679459 100644 --- a/src/core/file_sys/system_archive/mii_model.cpp +++ b/src/core/file_sys/system_archive/mii_model.cpp @@ -40,7 +40,7 @@ VirtualDir MiiModel() { out->AddFile(std::make_shared<ArrayVfsFile<MiiModelData::SHAPE_MID.size()>>( MiiModelData::SHAPE_MID, "ShapeMid.dat")); - return std::move(out); + return out; } } // namespace FileSys::SystemArchive diff --git a/src/input_common/keyboard.cpp b/src/input_common/keyboard.cpp index 078374be54..afb8e6612c 100644 --- a/src/input_common/keyboard.cpp +++ b/src/input_common/keyboard.cpp @@ -76,7 +76,7 @@ std::unique_ptr<Input::ButtonDevice> Keyboard::Create(const Common::ParamPackage int key_code = params.Get("code", 0); std::unique_ptr<KeyButton> button = std::make_unique<KeyButton>(key_button_list); key_button_list->AddKeyButton(key_code, button.get()); - return std::move(button); + return button; } void Keyboard::PressKey(int key_code) { diff --git a/src/input_common/motion_emu.cpp b/src/input_common/motion_emu.cpp index 8682516285..d4cdf76a3f 100644 --- a/src/input_common/motion_emu.cpp +++ b/src/input_common/motion_emu.cpp @@ -145,7 +145,7 @@ std::unique_ptr<Input::MotionDevice> MotionEmu::Create(const Common::ParamPackag // Previously created device is disconnected here. Having two motion devices for 3DS is not // expected. current_device = device_wrapper->device; - return std::move(device_wrapper); + return device_wrapper; } void MotionEmu::BeginTilt(int x, int y) { |
