citra/citra-canary
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-canary.git synced 2024-12-25 17:55:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

More cleaning up

Browse source
This commit is contained in:
Hamish Milne 2020-03-29 19:07:56 +01:00
parent 6760ea18b6
commit 9bd189a155
5 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/hle/kernel/process.h
View file

@ -11,9 +11,10 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <boost/container/static_vector.hpp> #include <boost/container/static_vector.hpp>
#include <boost/serialization/array.hpp>
#include <boost/serialization/base_object.hpp> #include <boost/serialization/base_object.hpp>
#include <boost/serialization/vector.hpp>
#include <boost/serialization/string.hpp> #include <boost/serialization/string.hpp>
#include <boost/serialization/vector.hpp>
#include "common/bit_field.h" #include "common/bit_field.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "core/hle/kernel/handle_table.h" #include "core/hle/kernel/handle_table.h"

1
src/core/hle/service/am/am.h
View file

@ -155,7 +155,6 @@ std::string GetMediaTitlePath(Service::FS::MediaType media_type);
class Module final { class Module final {
public: public:
explicit Module(Core::System& system); explicit Module(Core::System& system);
Module() = default;
~Module(); ~Module();
class Interface : public ServiceFramework<Interface> { class Interface : public ServiceFramework<Interface> {

2
src/core/hle/service/cam/cam.cpp
View file

@ -21,6 +21,8 @@
#include "core/memory.h" #include "core/memory.h"
#include "core/settings.h" #include "core/settings.h"
SERVICE_CONSTRUCT_IMPL(Service::CAM::Module)
namespace Service::CAM { namespace Service::CAM {
template <class Archive> template <class Archive>

7
src/core/hle/service/cam/cam.h
View file

@ -882,9 +882,4 @@ void InstallInterfaces(Core::System& system);
} // namespace Service::CAM } // namespace Service::CAM
namespace boost::serialization { SERVICE_CONSTRUCT(Service::CAM::Module)
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

8
src/tests/core/hle/kernel/hle_ipc.cpp
View file

@ -15,8 +15,6 @@
#include "core/hle/kernel/process.h" #include "core/hle/kernel/process.h"
#include "core/hle/kernel/server_session.h" #include "core/hle/kernel/server_session.h"
SERIALIZE_EXPORT_IMPL(Kernel::SessionRequestHandler::SessionDataBase)
namespace Kernel { namespace Kernel {
static std::shared_ptr<Object> MakeObject(Kernel::KernelSystem& 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]") { TEST_CASE("HLERequestContext::PopulateFromIncomingCommandBuffer", "[core][kernel]") {
Core::Timing timing(1, 100); Core::Timing timing(1, 100);
Memory::MemorySystem memory; Memory::MemorySystem memory;
Kernel::KernelSystem kernel(memory, timing, [] {}, 0, 1, 0); Kernel::KernelSystem kernel(
memory, timing, [] {}, 0, 1, 0);
auto [server, client] = kernel.CreateSessionPair(); auto [server, client] = kernel.CreateSessionPair();
HLERequestContext context(kernel, std::move(server), nullptr); HLERequestContext context(kernel, std::move(server), nullptr);
@ -241,7 +240,8 @@ TEST_CASE("HLERequestContext::PopulateFromIncomingCommandBuffer", "[core][kernel
TEST_CASE("HLERequestContext::WriteToOutgoingCommandBuffer", "[core][kernel]") { TEST_CASE("HLERequestContext::WriteToOutgoingCommandBuffer", "[core][kernel]") {
Core::Timing timing(1, 100); Core::Timing timing(1, 100);
Memory::MemorySystem memory; Memory::MemorySystem memory;
Kernel::KernelSystem kernel(memory, timing, [] {}, 0, 1, 0); Kernel::KernelSystem kernel(
memory, timing, [] {}, 0, 1, 0);
auto [server, client] = kernel.CreateSessionPair(); auto [server, client] = kernel.CreateSessionPair();
HLERequestContext context(kernel, std::move(server), nullptr); HLERequestContext context(kernel, std::move(server), nullptr);