diff options
author | Lioncash <mathew1800@gmail.com> | 2019-03-05 15:20:11 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-03-05 15:53:38 +0100 |
commit | 02bc9e9de14664f337da07f0efce750a0b6e993a (patch) | |
tree | 1c104148856a81c4e84c2c07b3016eb5be45bb22 /src/core/hle/kernel | |
parent | Merge pull request #2185 from FearlessTobi/port-4630 (diff) | |
download | yuzu-02bc9e9de14664f337da07f0efce750a0b6e993a.tar yuzu-02bc9e9de14664f337da07f0efce750a0b6e993a.tar.gz yuzu-02bc9e9de14664f337da07f0efce750a0b6e993a.tar.bz2 yuzu-02bc9e9de14664f337da07f0efce750a0b6e993a.tar.lz yuzu-02bc9e9de14664f337da07f0efce750a0b6e993a.tar.xz yuzu-02bc9e9de14664f337da07f0efce750a0b6e993a.tar.zst yuzu-02bc9e9de14664f337da07f0efce750a0b6e993a.zip |
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r-- | src/core/hle/kernel/hle_ipc.h | 10 | ||||
-rw-r--r-- | src/core/hle/kernel/svc.cpp | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h index cb1c5aff3..0107acea4 100644 --- a/src/core/hle/kernel/hle_ipc.h +++ b/src/core/hle/kernel/hle_ipc.h @@ -15,6 +15,8 @@ #include "core/hle/ipc.h" #include "core/hle/kernel/object.h" +union ResultCode; + namespace Service { class ServiceFrameworkBase; } @@ -208,14 +210,12 @@ public: template <typename T> SharedPtr<T> GetCopyObject(std::size_t index) { - ASSERT(index < copy_objects.size()); - return DynamicObjectCast<T>(copy_objects[index]); + return DynamicObjectCast<T>(copy_objects.at(index)); } template <typename T> SharedPtr<T> GetMoveObject(std::size_t index) { - ASSERT(index < move_objects.size()); - return DynamicObjectCast<T>(move_objects[index]); + return DynamicObjectCast<T>(move_objects.at(index)); } void AddMoveObject(SharedPtr<Object> object) { @@ -232,7 +232,7 @@ public: template <typename T> std::shared_ptr<T> GetDomainRequestHandler(std::size_t index) const { - return std::static_pointer_cast<T>(domain_request_handlers[index]); + return std::static_pointer_cast<T>(domain_request_handlers.at(index)); } void SetDomainRequestHandlers( diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index c5d399bab..5709134d5 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp @@ -20,6 +20,7 @@ #include "core/hle/kernel/address_arbiter.h" #include "core/hle/kernel/client_port.h" #include "core/hle/kernel/client_session.h" +#include "core/hle/kernel/errors.h" #include "core/hle/kernel/handle_table.h" #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/mutex.h" |