bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix/workaround static object initialization in gflags

Browse Source
This commit is contained in:
Sergey Sharybin 2016-02-17 15:00:12 +01:00
parent 157bc3dbbf
commit d81dd2da0f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extern/gflags/src/gflags.cc vendored
View File

@ -881,9 +881,15 @@ FlagRegistry* FlagRegistry::global_registry_ = NULL;
Mutex FlagRegistry::global_registry_lock_(Mutex::LINKER_INITIALIZED);
FlagRegistry* FlagRegistry::GlobalRegistry() {
MutexLock acquire_lock(&global_registry_lock_);
if (!global_registry_) {
global_registry_ = new FlagRegistry;
if (GetArgvSum() != 0) {
MutexLock acquire_lock(&global_registry_lock_);
if (!global_registry_) {
global_registry_ = new FlagRegistry;
}
} else {
if (!global_registry_) {
global_registry_ = new FlagRegistry;
}
}
return global_registry_;
}