Просмотр исходного кода

Merge pull request #1412 from lioncash/move

kernel/object: Remove unnecessary std::move from DynamicObjectCast()
bunnei 7 лет назад
Родитель
Сommit
97c0ac3545
2 измененных файлов с 2 добавлено и 3 удалено
  1. 1 2
      src/core/hle/kernel/object.h
  2. 1 1
      src/core/hle/kernel/wait_object.h

+ 1 - 2
src/core/hle/kernel/object.h

@@ -6,7 +6,6 @@
 
 
 #include <atomic>
 #include <atomic>
 #include <string>
 #include <string>
-#include <utility>
 
 
 #include <boost/smart_ptr/intrusive_ptr.hpp>
 #include <boost/smart_ptr/intrusive_ptr.hpp>
 
 
@@ -97,7 +96,7 @@ using SharedPtr = boost::intrusive_ptr<T>;
 template <typename T>
 template <typename T>
 inline SharedPtr<T> DynamicObjectCast(SharedPtr<Object> object) {
 inline SharedPtr<T> DynamicObjectCast(SharedPtr<Object> object) {
     if (object != nullptr && object->GetHandleType() == T::HANDLE_TYPE) {
     if (object != nullptr && object->GetHandleType() == T::HANDLE_TYPE) {
-        return boost::static_pointer_cast<T>(std::move(object));
+        return boost::static_pointer_cast<T>(object);
     }
     }
     return nullptr;
     return nullptr;
 }
 }

+ 1 - 1
src/core/hle/kernel/wait_object.h

@@ -69,7 +69,7 @@ private:
 template <>
 template <>
 inline SharedPtr<WaitObject> DynamicObjectCast<WaitObject>(SharedPtr<Object> object) {
 inline SharedPtr<WaitObject> DynamicObjectCast<WaitObject>(SharedPtr<Object> object) {
     if (object != nullptr && object->IsWaitable()) {
     if (object != nullptr && object->IsWaitable()) {
-        return boost::static_pointer_cast<WaitObject>(std::move(object));
+        return boost::static_pointer_cast<WaitObject>(object);
     }
     }
     return nullptr;
     return nullptr;
 }
 }