mirror of
https://github.com/Lime3DS/Lime3DS.git
synced 2024-11-01 16:05:07 +01:00
Fix clang format
This commit is contained in:
parent
1fb3c9f08c
commit
c5a3bf9728
@ -84,7 +84,7 @@ public:
|
|||||||
std::shared_ptr<AddressArbiter> parent;
|
std::shared_ptr<AddressArbiter> parent;
|
||||||
|
|
||||||
void WakeUp(ThreadWakeupReason reason, std::shared_ptr<Thread> thread,
|
void WakeUp(ThreadWakeupReason reason, std::shared_ptr<Thread> thread,
|
||||||
std::shared_ptr<WaitObject> object) override {
|
std::shared_ptr<WaitObject> object) override {
|
||||||
parent->WakeUp(reason, thread, object);
|
parent->WakeUp(reason, thread, object);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -103,7 +103,7 @@ void AddressArbiter::WakeUp(ThreadWakeupReason reason, std::shared_ptr<Thread> t
|
|||||||
ASSERT(reason == ThreadWakeupReason::Timeout);
|
ASSERT(reason == ThreadWakeupReason::Timeout);
|
||||||
// Remove the newly-awakened thread from the Arbiter's waiting list.
|
// 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.erase(std::remove(waiting_threads.begin(), waiting_threads.end(), thread),
|
||||||
waiting_threads.end());
|
waiting_threads.end());
|
||||||
};
|
};
|
||||||
|
|
||||||
ResultCode AddressArbiter::ArbitrateAddress(std::shared_ptr<Thread> thread, ArbitrationType type,
|
ResultCode AddressArbiter::ArbitrateAddress(std::shared_ptr<Thread> thread, ArbitrationType type,
|
||||||
|
@ -93,9 +93,10 @@ private:
|
|||||||
void serialize(Archive& ar, const unsigned int file_version) {
|
void serialize(Archive& ar, const unsigned int file_version) {
|
||||||
ar& boost::serialization::base_object<Object>(*this);
|
ar& boost::serialization::base_object<Object>(*this);
|
||||||
if (file_version == 1) {
|
if (file_version == 1) {
|
||||||
// This rigmarole is needed because in past versions, AddressArbiter inherited WakeupCallback
|
// This rigmarole is needed because in past versions, AddressArbiter inherited
|
||||||
// But it turns out this breaks shared_from_this, so we split it out.
|
// 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.
|
// Using a dummy class to deserialize a base_object allows compatibility to be
|
||||||
|
// maintained.
|
||||||
DummyCallback x;
|
DummyCallback x;
|
||||||
ar& boost::serialization::base_object<WakeupCallback>(x);
|
ar& boost::serialization::base_object<WakeupCallback>(x);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user