More cleaning up
This commit is contained in:
parent
6760ea18b6
commit
9bd189a155
|
@ -11,9 +11,10 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
#include <boost/container/static_vector.hpp>
|
||||
#include <boost/serialization/array.hpp>
|
||||
#include <boost/serialization/base_object.hpp>
|
||||
#include <boost/serialization/vector.hpp>
|
||||
#include <boost/serialization/string.hpp>
|
||||
#include <boost/serialization/vector.hpp>
|
||||
#include "common/bit_field.h"
|
||||
#include "common/common_types.h"
|
||||
#include "core/hle/kernel/handle_table.h"
|
||||
|
|
|
@ -155,7 +155,6 @@ std::string GetMediaTitlePath(Service::FS::MediaType media_type);
|
|||
class Module final {
|
||||
public:
|
||||
explicit Module(Core::System& system);
|
||||
Module() = default;
|
||||
~Module();
|
||||
|
||||
class Interface : public ServiceFramework<Interface> {
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
#include "core/memory.h"
|
||||
#include "core/settings.h"
|
||||
|
||||
SERVICE_CONSTRUCT_IMPL(Service::CAM::Module)
|
||||
|
||||
namespace Service::CAM {
|
||||
|
||||
template <class Archive>
|
||||
|
|
|
@ -882,9 +882,4 @@ void InstallInterfaces(Core::System& system);
|
|||
|
||||
} // namespace Service::CAM
|
||||
|
||||
namespace boost::serialization {
|
||||
template <class Archive>
|
||||
void load_construct_data(Archive& ar, Service::CAM::Module* t, const unsigned int) {
|
||||
::new (t) Service::CAM::Module(Core::Global<Core::System>());
|
||||
}
|
||||
} // namespace boost::serialization
|
||||
SERVICE_CONSTRUCT(Service::CAM::Module)
|
||||
|
|
|
@ -15,8 +15,6 @@
|
|||
#include "core/hle/kernel/process.h"
|
||||
#include "core/hle/kernel/server_session.h"
|
||||
|
||||
SERIALIZE_EXPORT_IMPL(Kernel::SessionRequestHandler::SessionDataBase)
|
||||
|
||||
namespace Kernel {
|
||||
|
||||
static std::shared_ptr<Object> MakeObject(Kernel::KernelSystem& kernel) {
|
||||
|
@ -26,7 +24,8 @@ static std::shared_ptr<Object> MakeObject(Kernel::KernelSystem& kernel) {
|
|||
TEST_CASE("HLERequestContext::PopulateFromIncomingCommandBuffer", "[core][kernel]") {
|
||||
Core::Timing timing(1, 100);
|
||||
Memory::MemorySystem memory;
|
||||
Kernel::KernelSystem kernel(memory, timing, [] {}, 0, 1, 0);
|
||||
Kernel::KernelSystem kernel(
|
||||
memory, timing, [] {}, 0, 1, 0);
|
||||
auto [server, client] = kernel.CreateSessionPair();
|
||||
HLERequestContext context(kernel, std::move(server), nullptr);
|
||||
|
||||
|
@ -241,7 +240,8 @@ TEST_CASE("HLERequestContext::PopulateFromIncomingCommandBuffer", "[core][kernel
|
|||
TEST_CASE("HLERequestContext::WriteToOutgoingCommandBuffer", "[core][kernel]") {
|
||||
Core::Timing timing(1, 100);
|
||||
Memory::MemorySystem memory;
|
||||
Kernel::KernelSystem kernel(memory, timing, [] {}, 0, 1, 0);
|
||||
Kernel::KernelSystem kernel(
|
||||
memory, timing, [] {}, 0, 1, 0);
|
||||
auto [server, client] = kernel.CreateSessionPair();
|
||||
HLERequestContext context(kernel, std::move(server), nullptr);
|
||||
|
||||
|
|
Reference in New Issue