From: Jonathan Wakely <jwakely.gcc@gmail.com>
Date: Tue, 22 Dec 2009 12:45:12 +0000 (+0000)
Subject: mutex (call_once(once_flag&, _Callable, _Args&&...)): Explicitly qualify with std... 
X-Git-Tag: releases/gcc-4.5.0~1553
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6be8006d35fa0a235786df00b1b500422e7866fa;p=thirdparty%2Fgcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fca9703309bf..217b2977a651 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 b3a043806411..cc91e95e456c 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