summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2018-09-29 11:58:58 -0400
committerGravatar GitHub2018-09-29 11:58:58 -0400
commit97c0ac35456c6fa59d87b456e6445e5a8a9e4ba2 (patch)
tree13043ec3435b79caca1e55094b51edb198aca6a3
parentMerge pull request #1411 from ReinUsesLisp/point-size (diff)
parentkernel/object: Remove unnecessary std::move from DynamicObjectCast() (diff)
downloadyuzu-97c0ac35456c6fa59d87b456e6445e5a8a9e4ba2.tar.gz
yuzu-97c0ac35456c6fa59d87b456e6445e5a8a9e4ba2.tar.xz
yuzu-97c0ac35456c6fa59d87b456e6445e5a8a9e4ba2.zip
Merge pull request #1412 from lioncash/move
kernel/object: Remove unnecessary std::move from DynamicObjectCast()
-rw-r--r--src/core/hle/kernel/object.h3
-rw-r--r--src/core/hle/kernel/wait_object.h2
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 @@
6 6
7#include <atomic> 7#include <atomic>
8#include <string> 8#include <string>
9#include <utility>
10 9
11#include <boost/smart_ptr/intrusive_ptr.hpp> 10#include <boost/smart_ptr/intrusive_ptr.hpp>
12 11
@@ -97,7 +96,7 @@ using SharedPtr = boost::intrusive_ptr<T>;
97template <typename T> 96template <typename T>
98inline SharedPtr<T> DynamicObjectCast(SharedPtr<Object> object) { 97inline SharedPtr<T> DynamicObjectCast(SharedPtr<Object> object) {
99 if (object != nullptr && object->GetHandleType() == T::HANDLE_TYPE) { 98 if (object != nullptr && object->GetHandleType() == T::HANDLE_TYPE) {
100 return boost::static_pointer_cast<T>(std::move(object)); 99 return boost::static_pointer_cast<T>(object);
101 } 100 }
102 return nullptr; 101 return nullptr;
103} 102}
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:
69template <> 69template <>
70inline SharedPtr<WaitObject> DynamicObjectCast<WaitObject>(SharedPtr<Object> object) { 70inline SharedPtr<WaitObject> DynamicObjectCast<WaitObject>(SharedPtr<Object> object) {
71 if (object != nullptr && object->IsWaitable()) { 71 if (object != nullptr && object->IsWaitable()) {
72 return boost::static_pointer_cast<WaitObject>(std::move(object)); 72 return boost::static_pointer_cast<WaitObject>(object);
73 } 73 }
74 return nullptr; 74 return nullptr;
75} 75}