Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-11 20:10:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

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

@ -24,11 +24,10 @@
namespace Service::CAM {
template <class Archive>
void Module::serialize(Archive& ar, const unsigned int)
{
ar & cameras;
ar & ports;
ar & is_camera_reload_pending;
void Module::serialize(Archive& ar, const unsigned int) {
ar& cameras;
ar& ports;
ar& is_camera_reload_pending;
}
SERIALIZE_IMPL(Module)

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

@ -10,9 +10,9 @@
#include <vector>
#include "common/common_types.h"
#include "common/swap.h"
#include "core/global.h"
#include "core/hle/result.h"
#include "core/hle/service/service.h"
#include "core/global.h"
namespace Core {
class System;
@ -183,14 +183,13 @@ struct Resolution {
private:
template <class Archive>
void serialize(Archive& ar, const unsigned int)
{
ar & width;
ar & height;
ar & crop_x0;
ar & crop_y0;
ar & crop_x1;
ar & crop_y1;
void serialize(Archive& ar, const unsigned int) {
ar& width;
ar& height;
ar& crop_x0;
ar& crop_y0;
ar& crop_x1;
ar& crop_y1;
}
friend class boost::serialization::access;
};
@ -755,12 +754,11 @@ private:
private:
template <class Archive>
void serialize(Archive& ar, const unsigned int)
{
ar & flip;
ar & effect;
ar & format;
ar & resolution;
void serialize(Archive& ar, const unsigned int) {
ar& flip;
ar& effect;
ar& format;
ar& resolution;
}
friend class boost::serialization::access;
};
@ -773,12 +771,11 @@ private:
private:
template <class Archive>
void serialize(Archive& ar, const unsigned int)
{
ar & impl;
ar & contexts;
ar & current_context;
ar & frame_rate;
void serialize(Archive& ar, const unsigned int) {
ar& impl;
ar& contexts;
ar& current_context;
ar& frame_rate;
}
friend class boost::serialization::access;
};
@ -818,27 +815,26 @@ private:
private:
template <class Archive>
void serialize(Archive& ar, const unsigned int)
{
ar & camera_id;
ar & is_active;
ar & is_pending_receiving;
ar & is_busy;
ar & is_receiving;
ar & is_trimming;
ar & x0;
ar & y0;
ar & x1;
ar & y1;
ar & transfer_bytes;
ar & completion_event;
ar & buffer_error_interrupt_event;
ar & vsync_interrupt_event;
void serialize(Archive& ar, const unsigned int) {
ar& camera_id;
ar& is_active;
ar& is_pending_receiving;
ar& is_busy;
ar& is_receiving;
ar& is_trimming;
ar& x0;
ar& y0;
ar& x1;
ar& y1;
ar& transfer_bytes;
ar& completion_event;
ar& buffer_error_interrupt_event;
ar& vsync_interrupt_event;
// TODO: Check if this is ever needed:
//ar & capture_result;
ar & dest_process;
ar & dest;
ar & dest_size;
// ar & capture_result;
ar& dest_process;
ar& dest;
ar& dest_size;
}
friend class boost::serialization::access;
};
@ -864,9 +860,8 @@ void InstallInterfaces(Core::System& system);
} // namespace Service::CAM
namespace boost::serialization {
template <class Archive>
inline void load_construct_data(Archive& ar, Service::CAM::Module* t, const unsigned int)
{
::new(t)Service::CAM::Module(Core::Global<Core::System>());
}
template <class Archive>
inline 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

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

@ -2,9 +2,9 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "common/archives.h"
#include "core/hle/service/cam/cam.h"
#include "core/hle/service/cam/cam_c.h"
#include "common/archives.h"
namespace Service::CAM {

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

@ -2,8 +2,8 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "core/hle/service/cam/cam_q.h"
#include "common/archives.h"
#include "core/hle/service/cam/cam_q.h"
namespace Service::CAM {

6
src/core/hle/service/cam/cam_q.h
View file

@ -11,11 +11,11 @@ namespace Service::CAM {
class CAM_Q : public ServiceFramework<CAM_Q> {
public:
CAM_Q();
private:
template <class Archive>
void serialize(Archive& ar, const unsigned int)
{
ar & boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
void serialize(Archive& ar, const unsigned int) {
ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
}
friend class boost::serialization::access;
};

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

@ -2,9 +2,9 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "common/archives.h"
#include "core/hle/service/cam/cam.h"
#include "core/hle/service/cam/cam_s.h"
#include "common/archives.h"
namespace Service::CAM {

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

@ -2,9 +2,9 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include "common/archives.h"
#include "core/hle/service/cam/cam.h"
#include "core/hle/service/cam/cam_u.h"
#include "common/archives.h"
namespace Service::CAM {