Quit Confirmation: defined static variable inline

wesnoth · Jan 17, 2021 · 3bea67e · 3bea67e
1 parent f91f02b
commit 3bea67e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/quit_confirmation.cpp b/src/quit_confirmation.cpp
@@ -24,9 +24,6 @@
 
 #include <boost/range/adaptor/reversed.hpp>
 
-std::vector<quit_confirmation*> quit_confirmation::blockers_ = std::vector<quit_confirmation*>();
-bool quit_confirmation::open_ = false;
-
 bool quit_confirmation::quit()
 {
 	if(!open_) {

diff --git a/src/quit_confirmation.hpp b/src/quit_confirmation.hpp
@@ -53,8 +53,9 @@ class quit_confirmation
 	// noncopyable
 	quit_confirmation(const quit_confirmation&) = delete;
 	const quit_confirmation& operator=(const quit_confirmation&) = delete;
-	static std::vector<quit_confirmation*> blockers_;
-	static bool open_;
+
+	static inline std::vector<quit_confirmation*> blockers_ {};
+	static inline bool open_ = false;
 
 	std::function<bool()> prompt_;
 };