From ffed499057c9dfa3fbc27b943a7993814da81acd Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Thu, 13 Oct 2022 23:22:51 -0700 Subject: [PATCH] Swaps static variable instantiation order in pause.cpp --- plugins/spectate/pause.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/spectate/pause.cpp b/plugins/spectate/pause.cpp index bb3e90ee0..10e8304f4 100644 --- a/plugins/spectate/pause.cpp +++ b/plugins/spectate/pause.cpp @@ -12,6 +12,9 @@ using namespace DFHack; using namespace Pausing; using namespace df::enums; +std::unordered_set PlayerLock::locks; +std::unordered_set AnnouncementLock::locks; + namespace pausing { AnnouncementLock announcementLock("monitor"); PlayerLock playerLock("monitor"); @@ -39,9 +42,6 @@ namespace pausing { } using namespace pausing; -std::unordered_set PlayerLock::locks; -std::unordered_set AnnouncementLock::locks; - template inline bool any_lock(Locks locks) { return std::any_of(locks.begin(), locks.end(), [](Lock* lock) { return lock->isLocked(); });