citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #4280 from FearlessTobi/port-1412 

Port yuzu-emu/yuzu#1412: "kernel/object: Remove unnecessary std::move from DynamicObjectCast()"
This commit is contained in:
Weiyi Wang 2018-09-29 22:33:49 -04:00 committed by GitHub
parent 7c97e8df62 d64094a0d2
commit 9f37b71b4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/hle/kernel/object.h
View File

@ -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>
@ -99,7 +98,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;
} }

2
src/core/hle/kernel/wait_object.h
View File

@ -59,7 +59,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;
} }