diff options
author | Lioncash <mathew1800@gmail.com> | 2018-09-28 08:10:22 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-09-28 08:17:57 +0200 |
commit | f4c24d0832830281f7af08193c10777d49de2ee1 (patch) | |
tree | e03d7fc2a2c9a454c5508631bf9ed7877a2c81a1 /src | |
parent | Merge pull request #1389 from PhiBabin/valgrind (diff) | |
download | yuzu-f4c24d0832830281f7af08193c10777d49de2ee1.tar yuzu-f4c24d0832830281f7af08193c10777d49de2ee1.tar.gz yuzu-f4c24d0832830281f7af08193c10777d49de2ee1.tar.bz2 yuzu-f4c24d0832830281f7af08193c10777d49de2ee1.tar.lz yuzu-f4c24d0832830281f7af08193c10777d49de2ee1.tar.xz yuzu-f4c24d0832830281f7af08193c10777d49de2ee1.tar.zst yuzu-f4c24d0832830281f7af08193c10777d49de2ee1.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/object.h | 3 | ||||
-rw-r--r-- | src/core/hle/kernel/wait_object.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/hle/kernel/object.h b/src/core/hle/kernel/object.h index b054cbf7d..9eb72315c 100644 --- a/src/core/hle/kernel/object.h +++ b/src/core/hle/kernel/object.h @@ -6,7 +6,6 @@ #include <atomic> #include <string> -#include <utility> #include <boost/smart_ptr/intrusive_ptr.hpp> @@ -97,7 +96,7 @@ using SharedPtr = boost::intrusive_ptr<T>; template <typename T> inline SharedPtr<T> DynamicObjectCast(SharedPtr<Object> object) { 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; } diff --git a/src/core/hle/kernel/wait_object.h b/src/core/hle/kernel/wait_object.h index 0bd97133c..f4367ee28 100644 --- a/src/core/hle/kernel/wait_object.h +++ b/src/core/hle/kernel/wait_object.h @@ -69,7 +69,7 @@ private: template <> inline SharedPtr<WaitObject> DynamicObjectCast<WaitObject>(SharedPtr<Object> object) { if (object != nullptr && object->IsWaitable()) { - return boost::static_pointer_cast<WaitObject>(std::move(object)); + return boost::static_pointer_cast<WaitObject>(object); } return nullptr; } |