From c5a3bf97285962335a5fd02b6d20dbebca7b0168 Mon Sep 17 00:00:00 2001 From: Hamish Milne Date: Sat, 18 Apr 2020 15:14:01 +0100 Subject: [PATCH] Fix clang format --- src/core/hle/kernel/address_arbiter.cpp | 4 ++-- src/core/hle/kernel/address_arbiter.h | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp index 97228f153..dba814b66 100644 --- a/src/core/hle/kernel/address_arbiter.cpp +++ b/src/core/hle/kernel/address_arbiter.cpp @@ -84,7 +84,7 @@ public: std::shared_ptr parent; void WakeUp(ThreadWakeupReason reason, std::shared_ptr thread, - std::shared_ptr object) override { + std::shared_ptr object) override { parent->WakeUp(reason, thread, object); } @@ -103,7 +103,7 @@ void AddressArbiter::WakeUp(ThreadWakeupReason reason, std::shared_ptr t ASSERT(reason == ThreadWakeupReason::Timeout); // Remove the newly-awakened thread from the Arbiter's waiting list. waiting_threads.erase(std::remove(waiting_threads.begin(), waiting_threads.end(), thread), - waiting_threads.end()); + waiting_threads.end()); }; ResultCode AddressArbiter::ArbitrateAddress(std::shared_ptr thread, ArbitrationType type, diff --git a/src/core/hle/kernel/address_arbiter.h b/src/core/hle/kernel/address_arbiter.h index de7631066..4d8b12241 100644 --- a/src/core/hle/kernel/address_arbiter.h +++ b/src/core/hle/kernel/address_arbiter.h @@ -93,9 +93,10 @@ private: void serialize(Archive& ar, const unsigned int file_version) { ar& boost::serialization::base_object(*this); if (file_version == 1) { - // This rigmarole is needed because in past versions, AddressArbiter inherited WakeupCallback - // But it turns out this breaks shared_from_this, so we split it out. - // Using a dummy class to deserialize a base_object allows compatibility to be maintained. + // This rigmarole is needed because in past versions, AddressArbiter inherited + // WakeupCallback But it turns out this breaks shared_from_this, so we split it out. + // Using a dummy class to deserialize a base_object allows compatibility to be + // maintained. DummyCallback x; ar& boost::serialization::base_object(x); }