generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bug #3489: The code assumed that two global variables would be constructed in a particular order, but global variable initialization order is compiler-dependent.

Browse Source
This commit is contained in:
Drew Jetter 2014-01-18 16:39:50 -07:00
parent 088535fa56
commit 6bf599b1bc
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/core/src/system.cpp
View File

@ -1131,17 +1131,24 @@ public:
} }
} }
}; };
static TLSContainerStorage tlsContainerStorage;
// This is a wrapper function that will ensure 'tlsContainerStorage' is constructed on first use.
// For more information: http://www.parashift.com/c++-faq/static-init-order-on-first-use.html
static TLSContainerStorage& getTLSContainerStorage()
{
static TLSContainerStorage *tlsContainerStorage = new TLSContainerStorage();
return *tlsContainerStorage;
}
TLSDataContainer::TLSDataContainer() TLSDataContainer::TLSDataContainer()
: key_(-1) : key_(-1)
{ {
key_ = tlsContainerStorage.allocateKey(this); key_ = getTLSContainerStorage().allocateKey(this);
} }
TLSDataContainer::~TLSDataContainer() TLSDataContainer::~TLSDataContainer()
{ {
tlsContainerStorage.releaseKey(key_, this); getTLSContainerStorage().releaseKey(key_, this);
key_ = -1; key_ = -1;
} }
@ -1166,7 +1173,7 @@ TLSStorage::~TLSStorage()
void*& data = tlsData_[i]; void*& data = tlsData_[i];
if (data) if (data)
{ {
tlsContainerStorage.destroyData(i, data); getTLSContainerStorage().destroyData(i, data);
data = NULL; data = NULL;
} }
} }