1
0
Fork 0
forked from suyu/suyu

core/hle/ipc: Remove unnecessary includes

Removes a few inclusion dependencies from the headers or replaces
existing ones with ones that don't indirectly include the required
headers.

This allows removing an inclusion of core/memory.h, meaning that if the
memory header is ever changed in the future, it won't result in
rebuilding the entirety of the HLE services (as the IPC headers are used
quite ubiquitously throughout the HLE service implementations).
This commit is contained in:
Lioncash 2019-03-05 09:20:11 -05:00
parent cc92c054ec
commit 02bc9e9de1
6 changed files with 12 additions and 8 deletions

View file

@ -4,10 +4,10 @@
#pragma once #pragma once
#include "common/bit_field.h"
#include "common/common_funcs.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "common/swap.h" #include "common/swap.h"
#include "core/hle/kernel/errors.h"
#include "core/memory.h"
namespace IPC { namespace IPC {

View file

@ -15,6 +15,8 @@
#include "core/hle/ipc.h" #include "core/hle/ipc.h"
#include "core/hle/kernel/object.h" #include "core/hle/kernel/object.h"
union ResultCode;
namespace Service { namespace Service {
class ServiceFrameworkBase; class ServiceFrameworkBase;
} }
@ -208,14 +210,12 @@ public:
template <typename T> template <typename T>
SharedPtr<T> GetCopyObject(std::size_t index) { SharedPtr<T> GetCopyObject(std::size_t index) {
ASSERT(index < copy_objects.size()); return DynamicObjectCast<T>(copy_objects.at(index));
return DynamicObjectCast<T>(copy_objects[index]);
} }
template <typename T> template <typename T>
SharedPtr<T> GetMoveObject(std::size_t index) { SharedPtr<T> GetMoveObject(std::size_t index) {
ASSERT(index < move_objects.size()); return DynamicObjectCast<T>(move_objects.at(index));
return DynamicObjectCast<T>(move_objects[index]);
} }
void AddMoveObject(SharedPtr<Object> object) { void AddMoveObject(SharedPtr<Object> object) {
@ -232,7 +232,7 @@ public:
template <typename T> template <typename T>
std::shared_ptr<T> GetDomainRequestHandler(std::size_t index) const { 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( void SetDomainRequestHandlers(

View file

@ -20,6 +20,7 @@
#include "core/hle/kernel/address_arbiter.h" #include "core/hle/kernel/address_arbiter.h"
#include "core/hle/kernel/client_port.h" #include "core/hle/kernel/client_port.h"
#include "core/hle/kernel/client_session.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/handle_table.h"
#include "core/hle/kernel/kernel.h" #include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/mutex.h" #include "core/hle/kernel/mutex.h"

View file

@ -8,7 +8,6 @@
#include <utility> #include <utility>
#include "common/assert.h" #include "common/assert.h"
#include "common/bit_field.h" #include "common/bit_field.h"
#include "common/common_funcs.h"
#include "common/common_types.h" #include "common/common_types.h"
// All the constants in this file come from http://switchbrew.org/index.php?title=Error_codes // All the constants in this file come from http://switchbrew.org/index.php?title=Error_codes

View file

@ -7,6 +7,7 @@
#include "common/string_util.h" #include "common/string_util.h"
#include "core/core.h" #include "core/core.h"
#include "core/frontend/applets/software_keyboard.h" #include "core/frontend/applets/software_keyboard.h"
#include "core/hle/result.h"
#include "core/hle/service/am/am.h" #include "core/hle/service/am/am.h"
#include "core/hle/service/am/applets/software_keyboard.h" #include "core/hle/service/am/applets/software_keyboard.h"

View file

@ -9,10 +9,13 @@
#include <vector> #include <vector>
#include "common/common_funcs.h" #include "common/common_funcs.h"
#include "common/common_types.h"
#include "common/swap.h" #include "common/swap.h"
#include "core/hle/service/am/am.h" #include "core/hle/service/am/am.h"
#include "core/hle/service/am/applets/applets.h" #include "core/hle/service/am/applets/applets.h"
union ResultCode;
namespace Service::AM::Applets { namespace Service::AM::Applets {
enum class KeysetDisable : u32 { enum class KeysetDisable : u32 {