mirrors/turtle
3
0
Fork 0
mirror of https://github.com/mat007/turtle.git synced 2026-06-22 12:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed race condition for C++03 compilers

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@733 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2014-05-21 07:09:28 +00:00
parent b0fc3f45bc
commit a56267c468
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
turtle/detail/functor.hpp
View file

@ -17,23 +17,31 @@ namespace mock
{ {
namespace detail namespace detail
{ {
class functor_mutex_t :
public boost::unit_test::singleton< functor_mutex_t >,
public mutex
{
private:
BOOST_TEST_SINGLETON_CONS( functor_mutex_t );
};
BOOST_TEST_SINGLETON_INST( functor_mutex )
template< typename Signature > template< typename Signature >
struct functor : function< Signature > struct functor : function< Signature >
{ {
functor() functor()
{ {
static mutex m_; scoped_lock _( functor_mutex );
scoped_lock _( m_ );
static functor* f = 0; static functor* f = 0;
if( f ) if( f )
{ {
*this = *f; *this = *f;
f = 0; f = 0;
m_.unlock(); functor_mutex.unlock();
} }
else else
{ {
m_.lock(); functor_mutex.lock();
f = this; f = this;
} }
} }