upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-02 23:45:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Quit Confirmation: defined static variable inline

Browse Source
This commit is contained in:
Charles Dang 2021-01-18 09:43:05 +11:00
parent f91f02b4fd
commit 3bea67efc6
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/quit_confirmation.cpp
View File

@ -24,9 +24,6 @@
#include <boost/range/adaptor/reversed.hpp> #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() bool quit_confirmation::quit()
{ {
if(!open_) { if(!open_) {

5
src/quit_confirmation.hpp
View File

@ -53,8 +53,9 @@ private:
// noncopyable // noncopyable
quit_confirmation(const quit_confirmation&) = delete; quit_confirmation(const quit_confirmation&) = delete;
const quit_confirmation& operator=(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_; std::function<bool()> prompt_;
}; };