Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clang-format fixes

Browse source
This commit is contained in:
Hamish Milne 2019-12-27 21:07:29 +00:00 • committed by zhupengfei
parent d482fb359c
commit 7b846ffa98
117 changed files with 797 additions and 925 deletions
Download patch file Download diff file Expand all files Collapse all files

69
src/core/hle/service/service.h
View file

@ -11,8 +11,8 @@
#include <string>
#include <boost/container/flat_map.hpp>
#include <boost/serialization/assume_abstract.hpp>
#include <boost/serialization/shared_ptr.hpp>
#include <boost/serialization/base_object.hpp>
#include <boost/serialization/shared_ptr.hpp>
#include "common/common_types.h"
#include "common/construct.h"
#include "core/hle/kernel/hle_ipc.h"
@ -199,42 +199,37 @@ extern const std::array<ServiceModuleInfo, 40> service_module_map;
} // namespace Service
#define SERVICE_SERIALIZATION(T, MFIELD, TMODULE) \
template <class Archive> \
void save_construct(Archive& ar, const unsigned int file_version) const \
{ \
ar << MFIELD; \
} \
\
template <class Archive> \
static void load_construct(Archive& ar, T* t, const unsigned int file_version) \
{ \
std::shared_ptr<TMODULE> MFIELD; \
ar >> MFIELD; \
::new(t)T(MFIELD); \
} \
\
template <class Archive> \
void serialize(Archive& ar, const unsigned int) \
{ \
ar & boost::serialization::base_object<Kernel::SessionRequestHandler>(*this); \
} \
friend class boost::serialization::access; \
#define SERVICE_SERIALIZATION(T, MFIELD, TMODULE) \
template <class Archive> \
void save_construct(Archive& ar, const unsigned int file_version) const { \
ar << MFIELD; \
} \
\
template <class Archive> \
static void load_construct(Archive& ar, T* t, const unsigned int file_version) { \
std::shared_ptr<TMODULE> MFIELD; \
ar >> MFIELD; \
::new (t) T(MFIELD); \
} \
\
template <class Archive> \
void serialize(Archive& ar, const unsigned int) { \
ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this); \
} \
friend class boost::serialization::access; \
friend class ::construct_access;
#define SERVICE_CONSTRUCT(T) \
namespace boost::serialization { \
template <class Archive> \
void load_construct_data(Archive& ar, T* t, const unsigned int); \
}
#define SERVICE_CONSTRUCT(T) \
namespace boost::serialization { \
template <class Archive> \
void load_construct_data(Archive& ar, T* t, const unsigned int); \
}
#define SERVICE_CONSTRUCT_IMPL(T) \
namespace boost::serialization { \
template <class Archive> \
void load_construct_data(Archive& ar, T* t, const unsigned int) \
{ \
::new(t)T(Core::Global<Core::System>()); \
} \
template \
void load_construct_data<iarchive>(iarchive& ar, T* t, const unsigned int); \
}
#define SERVICE_CONSTRUCT_IMPL(T) \
namespace boost::serialization { \
template <class Archive> \
void load_construct_data(Archive& ar, T* t, const unsigned int) { \
::new (t) T(Core::Global<Core::System>()); \
} \
template void load_construct_data<iarchive>(iarchive & ar, T* t, const unsigned int); \
}