mirror of
https://github.com/yuzu-emu/yuzu-android
synced 2024-12-27 12:01:21 -08:00
Merge pull request #2197 from lioncash/include
core/hle/ipc: Remove unnecessary includes
This commit is contained in:
commit
ed0bdcc638
@ -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 {
|
||||||
|
|
||||||
|
@ -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(
|
||||||
|
@ -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"
|
||||||
|
@ -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
|
||||||
|
@ -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"
|
||||||
|
|
||||||
|
@ -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 {
|
||||||
|
Loading…
Reference in New Issue
Block a user