git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mutex (call_once): Store closure in __once_functor as bound function wrapper might not be copyable. 

* include/std/mutex (call_once): Store closure in __once_functor
	as bound function wrapper might not be copyable.

From-SVN: r181128
This commit is contained in:
Jonathan Wakely 2011-11-07 22:26:15 +00:00 committed by Jonathan Wakely
parent c5a0818e68
commit 48d8dd06b0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2011-11-07 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/std/mutex (call_once): Store closure in __once_functor
as bound function wrapper might not be copyable.
2011-11-07 Andrew MacLeod <amacleod@redhat.com>
* include/bits/atomic_base.h (atomic_thread_fence): Revert.

3
libstdc++-v3/include/std/mutex
View File

@ -810,8 +810,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__once_call = &__once_call_impl<decltype(__bound_functor)>;
#else
unique_lock<mutex> __functor_lock(__get_once_mutex());
__once_functor = std::__bind_simple(std::forward<_Callable>(__f),
auto __callable = std::__bind_simple(std::forward<_Callable>(__f),
std::forward<_Args>(__args)...);
__once_functor = [&]() { __callable(); };
__set_once_functor_lock_ptr(&__functor_lock);
#endif