From f156fdd332f7f1089ec827e5ed756ae6b6e5548a Mon Sep 17 00:00:00 2001 From: Hamish Milne Date: Tue, 31 Mar 2020 18:27:33 +0100 Subject: [PATCH] clang format fixes etc. --- .../serialization/boost_interval_set.hpp | 28 +++++++++++++++---- src/core/hle/kernel/memory.h | 1 - src/core/hle/kernel/mutex.h | 2 +- src/core/hle/kernel/server_port.cpp | 2 +- src/core/hle/service/cecd/cecd.cpp | 5 ++-- src/core/hle/service/ir/extra_hid.h | 2 +- src/tests/core/hle/kernel/hle_ipc.cpp | 6 ++-- 7 files changed, 30 insertions(+), 16 deletions(-) diff --git a/src/common/serialization/boost_interval_set.hpp b/src/common/serialization/boost_interval_set.hpp index 08e6a14f1..905e3f145 100644 --- a/src/common/serialization/boost_interval_set.hpp +++ b/src/common/serialization/boost_interval_set.hpp @@ -5,16 +5,34 @@ #pragma once #include +#include #include "common/serialization/boost_discrete_interval.hpp" namespace boost::serialization { template -void serialize(Archive& ar, boost::icl::interval_set& obj, const unsigned int file_version) { - using IntervalSet = boost::icl::interval_set; - // This works because interval_set has exactly one member of type ImplSetT - static_assert(std::is_standard_layout_v); - ar&*(reinterpret_cast(&obj)); +void save(Archive& ar, const boost::icl::interval_set& set, const unsigned int file_version) { + ar << static_cast(set.size()); + for (auto& v : set) { + ar << v; + } +} + +template +void load(Archive& ar, boost::icl::interval_set& set, const unsigned int file_version) { + u64 count{}; + ar >> count; + set.clear(); + for (u64 i = 0; i < count; i++) { + T value{}; + ar >> value; + set.insert(value); + } +} + +template +void serialize(Archive& ar, boost::icl::interval_set& set, const unsigned int file_version) { + boost::serialization::split_free(ar, set, file_version); } } // namespace boost::serialization diff --git a/src/core/hle/kernel/memory.h b/src/core/hle/kernel/memory.h index 0560b0bec..739369a9c 100644 --- a/src/core/hle/kernel/memory.h +++ b/src/core/hle/kernel/memory.h @@ -5,7 +5,6 @@ #pragma once #include -#include #include #include #include "common/common_types.h" diff --git a/src/core/hle/kernel/mutex.h b/src/core/hle/kernel/mutex.h index 73ee2a0e6..db98aa8c9 100644 --- a/src/core/hle/kernel/mutex.h +++ b/src/core/hle/kernel/mutex.h @@ -6,8 +6,8 @@ #include #include -#include #include +#include #include #include #include "common/common_types.h" diff --git a/src/core/hle/kernel/server_port.cpp b/src/core/hle/kernel/server_port.cpp index 4d293be34..006403925 100644 --- a/src/core/hle/kernel/server_port.cpp +++ b/src/core/hle/kernel/server_port.cpp @@ -5,8 +5,8 @@ #include #include #include -#include #include +#include #include "common/archives.h" #include "common/assert.h" #include "core/hle/kernel/client_port.h" diff --git a/src/core/hle/service/cecd/cecd.cpp b/src/core/hle/service/cecd/cecd.cpp index 31ecd990b..977a47842 100644 --- a/src/core/hle/service/cecd/cecd.cpp +++ b/src/core/hle/service/cecd/cecd.cpp @@ -2,8 +2,8 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include #include +#include #include #include #include @@ -1361,8 +1361,7 @@ void Module::CheckAndUpdateFile(const CecDataPathType path_type, const u32 ncch_ case CecDataPathType::MboxData: case CecDataPathType::MboxIcon: case CecDataPathType::MboxTitle: - default: { - } + default: {} } } diff --git a/src/core/hle/service/ir/extra_hid.h b/src/core/hle/service/ir/extra_hid.h index 4b27fba9b..d498c471f 100644 --- a/src/core/hle/service/ir/extra_hid.h +++ b/src/core/hle/service/ir/extra_hid.h @@ -70,7 +70,7 @@ private: template void serialize(Archive& ar, const unsigned int) { ar& hid_period; - ar& calibration_data; // This isn't writeable for now, but might be in future + ar& calibration_data; // This isn't writeable for now, but might be in future if (Archive::is_loading::value) { LoadInputDevices(); // zl, zr, c_stick are loaded here } diff --git a/src/tests/core/hle/kernel/hle_ipc.cpp b/src/tests/core/hle/kernel/hle_ipc.cpp index 890343cd8..f5623c8c1 100644 --- a/src/tests/core/hle/kernel/hle_ipc.cpp +++ b/src/tests/core/hle/kernel/hle_ipc.cpp @@ -24,8 +24,7 @@ static std::shared_ptr 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); @@ -240,8 +239,7 @@ 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);