@@ -138,6 +138,7 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size.");
#include <utility>
#include <vector>
#include <atomic>
+#include <mutex>
//The only available version is 3, as of Boost 1.50
#include <boost/version.hpp>
@@ -705,12 +705,8 @@ namespace VCMIDirs
static VCMIDirsIOS singleton;
#endif
- static bool initialized = false;
- if (!initialized)
- {
- singleton.init();
- initialized = true;
- }
+ static std::once_flag flag;
+ std::call_once(flag, [] { singleton.init(); });
return singleton;
}