mutex (call_once(once_flag&, _Callable, _Args&&...)): Explicitly qualify with std:: bind calls.
2009-12-22 Jonathan Wakely <jwakely.gcc@gmail.com> * include/std/mutex (call_once(once_flag&, _Callable, _Args&&...)): Explicitly qualify with std:: bind calls. From-SVN: r155397
This commit is contained in:
parent
d17c29c35f
commit
6be8006d35
|
@ -1,3 +1,8 @@
|
||||||
|
2009-12-22 Jonathan Wakely <jwakely.gcc@gmail.com>
|
||||||
|
|
||||||
|
* include/std/mutex (call_once(once_flag&, _Callable, _Args&&...)):
|
||||||
|
Explicitly qualify with std:: bind calls.
|
||||||
|
|
||||||
2009-12-21 Benjamin Kosnik <bkoz@redhat.com>
|
2009-12-21 Benjamin Kosnik <bkoz@redhat.com>
|
||||||
|
|
||||||
PR libstdc++/42456
|
PR libstdc++/42456
|
||||||
|
|
|
@ -722,12 +722,12 @@ namespace std
|
||||||
call_once(once_flag& __once, _Callable __f, _Args&&... __args)
|
call_once(once_flag& __once, _Callable __f, _Args&&... __args)
|
||||||
{
|
{
|
||||||
#ifdef _GLIBCXX_HAVE_TLS
|
#ifdef _GLIBCXX_HAVE_TLS
|
||||||
auto __bound_functor = bind(__f, __args...);
|
auto __bound_functor = std::bind(__f, __args...);
|
||||||
__once_callable = &__bound_functor;
|
__once_callable = &__bound_functor;
|
||||||
__once_call = &__once_call_impl<decltype(__bound_functor)>;
|
__once_call = &__once_call_impl<decltype(__bound_functor)>;
|
||||||
#else
|
#else
|
||||||
unique_lock<mutex> __functor_lock(__get_once_mutex());
|
unique_lock<mutex> __functor_lock(__get_once_mutex());
|
||||||
__once_functor = bind(__f, __args...);
|
__once_functor = std::bind(__f, __args...);
|
||||||
__set_once_functor_lock_ptr(&__functor_lock);
|
__set_once_functor_lock_ptr(&__functor_lock);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue