Parcourir la source

Merge pull request #4114 from MerryMage/nrvo

Remove redundant moves
LC il y a 6 ans
Parent
commit
8434630dcc

+ 1 - 1
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()>>(
     out->AddFile(std::make_shared<ArrayVfsFile<MiiModelData::SHAPE_MID.size()>>(
         MiiModelData::SHAPE_MID, "ShapeMid.dat"));
         MiiModelData::SHAPE_MID, "ShapeMid.dat"));
 
 
-    return std::move(out);
+    return out;
 }
 }
 
 
 } // namespace FileSys::SystemArchive
 } // namespace FileSys::SystemArchive

+ 1 - 1
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);
     int key_code = params.Get("code", 0);
     std::unique_ptr<KeyButton> button = std::make_unique<KeyButton>(key_button_list);
     std::unique_ptr<KeyButton> button = std::make_unique<KeyButton>(key_button_list);
     key_button_list->AddKeyButton(key_code, button.get());
     key_button_list->AddKeyButton(key_code, button.get());
-    return std::move(button);
+    return button;
 }
 }
 
 
 void Keyboard::PressKey(int key_code) {
 void Keyboard::PressKey(int key_code) {

+ 1 - 1
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
     // Previously created device is disconnected here. Having two motion devices for 3DS is not
     // expected.
     // expected.
     current_device = device_wrapper->device;
     current_device = device_wrapper->device;
-    return std::move(device_wrapper);
+    return device_wrapper;
 }
 }
 
 
 void MotionEmu::BeginTilt(int x, int y) {
 void MotionEmu::BeginTilt(int x, int y) {