diff options
| author | 2020-06-19 15:17:04 -0400 | |
|---|---|---|
| committer | 2020-06-19 15:17:04 -0400 | |
| commit | 8434630dcc42b65efacecdc3caa49adb4115b88e (patch) | |
| tree | 0717f95e8beda4396b754330a77a427793a387ac | |
| parent | Merge pull request #4080 from ogniK5377/audren-RendererInfo (diff) | |
| parent | input_common/motion_emu: Remove redundant move (diff) | |
| download | yuzu-8434630dcc42b65efacecdc3caa49adb4115b88e.tar.gz yuzu-8434630dcc42b65efacecdc3caa49adb4115b88e.tar.xz yuzu-8434630dcc42b65efacecdc3caa49adb4115b88e.zip | |
Merge pull request #4114 from MerryMage/nrvo
Remove redundant moves
| -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 6a9add87c..61bb67945 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() { | |||
| 40 | out->AddFile(std::make_shared<ArrayVfsFile<MiiModelData::SHAPE_MID.size()>>( | 40 | out->AddFile(std::make_shared<ArrayVfsFile<MiiModelData::SHAPE_MID.size()>>( |
| 41 | MiiModelData::SHAPE_MID, "ShapeMid.dat")); | 41 | MiiModelData::SHAPE_MID, "ShapeMid.dat")); |
| 42 | 42 | ||
| 43 | return std::move(out); | 43 | return out; |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | } // namespace FileSys::SystemArchive | 46 | } // namespace FileSys::SystemArchive |
diff --git a/src/input_common/keyboard.cpp b/src/input_common/keyboard.cpp index 078374be5..afb8e6612 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 | |||
| 76 | int key_code = params.Get("code", 0); | 76 | int key_code = params.Get("code", 0); |
| 77 | std::unique_ptr<KeyButton> button = std::make_unique<KeyButton>(key_button_list); | 77 | std::unique_ptr<KeyButton> button = std::make_unique<KeyButton>(key_button_list); |
| 78 | key_button_list->AddKeyButton(key_code, button.get()); | 78 | key_button_list->AddKeyButton(key_code, button.get()); |
| 79 | return std::move(button); | 79 | return button; |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | void Keyboard::PressKey(int key_code) { | 82 | void Keyboard::PressKey(int key_code) { |
diff --git a/src/input_common/motion_emu.cpp b/src/input_common/motion_emu.cpp index 868251628..d4cdf76a3 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 | |||
| 145 | // Previously created device is disconnected here. Having two motion devices for 3DS is not | 145 | // Previously created device is disconnected here. Having two motion devices for 3DS is not |
| 146 | // expected. | 146 | // expected. |
| 147 | current_device = device_wrapper->device; | 147 | current_device = device_wrapper->device; |
| 148 | return std::move(device_wrapper); | 148 | return device_wrapper; |
| 149 | } | 149 | } |
| 150 | 150 | ||
| 151 | void MotionEmu::BeginTilt(int x, int y) { | 151 | void MotionEmu::BeginTilt(int x, int y) { |