From 6be8006d35fa0a235786df00b1b500422e7866fa Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 22 Dec 2009 12:45:12 +0000 Subject: [PATCH] mutex (call_once(once_flag&, _Callable, _Args&&...)): Explicitly qualify with std:: bind calls. 2009-12-22 Jonathan Wakely * include/std/mutex (call_once(once_flag&, _Callable, _Args&&...)): Explicitly qualify with std:: bind calls. From-SVN: r155397 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/std/mutex | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index fca9703309b..217b2977a65 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2009-12-22 Jonathan Wakely + + * include/std/mutex (call_once(once_flag&, _Callable, _Args&&...)): + Explicitly qualify with std:: bind calls. + 2009-12-21 Benjamin Kosnik PR libstdc++/42456 diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex index b3a04380641..cc91e95e456 100644 --- a/libstdc++-v3/include/std/mutex +++ b/libstdc++-v3/include/std/mutex @@ -722,12 +722,12 @@ namespace std call_once(once_flag& __once, _Callable __f, _Args&&... __args) { #ifdef _GLIBCXX_HAVE_TLS - auto __bound_functor = bind(__f, __args...); + auto __bound_functor = std::bind(__f, __args...); __once_callable = &__bound_functor; __once_call = &__once_call_impl; #else unique_lock __functor_lock(__get_once_mutex()); - __once_functor = bind(__f, __args...); + __once_functor = std::bind(__f, __args...); __set_once_functor_lock_ptr(&__functor_lock); #endif