diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-12-22 12:45:12 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-12-22 12:45:12 +0000 |
| commit | 7f5666057239f227dea83d6fe5af57ec6e19b075 (patch) | |
| tree | 46ae7866b62c1bd48ae0e720eee6f74da4de8ac4 /libstdc++-v3 | |
| parent | c9b5e4ec320184345e8ee20df05876e768b818b4 (diff) | |
| download | gcc-7f5666057239f227dea83d6fe5af57ec6e19b075.tar.gz | |
2009-12-22 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/std/mutex (call_once(once_flag&, _Callable, _Args&&...)):
Explicitly qualify with std:: bind calls.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155397 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 <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> 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<decltype(__bound_functor)>; #else 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); #endif |