diff options
author | bunnei <bunneidev@gmail.com> | 2018-09-29 17:58:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-29 17:58:58 +0200 |
commit | 97c0ac35456c6fa59d87b456e6445e5a8a9e4ba2 (patch) | |
tree | 13043ec3435b79caca1e55094b51edb198aca6a3 | |
parent | Merge pull request #1411 from ReinUsesLisp/point-size (diff) | |
parent | kernel/object: Remove unnecessary std::move from DynamicObjectCast() (diff) | |
download | yuzu-97c0ac35456c6fa59d87b456e6445e5a8a9e4ba2.tar yuzu-97c0ac35456c6fa59d87b456e6445e5a8a9e4ba2.tar.gz yuzu-97c0ac35456c6fa59d87b456e6445e5a8a9e4ba2.tar.bz2 yuzu-97c0ac35456c6fa59d87b456e6445e5a8a9e4ba2.tar.lz yuzu-97c0ac35456c6fa59d87b456e6445e5a8a9e4ba2.tar.xz yuzu-97c0ac35456c6fa59d87b456e6445e5a8a9e4ba2.tar.zst yuzu-97c0ac35456c6fa59d87b456e6445e5a8a9e4ba2.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; } |