From: Johannes Singler <singler@kit.edu>
Date: Fri, 11 Feb 2011 10:11:41 +0000 (+0000)
Subject: re PR libstdc++/47433 (libstdc++ parallel mode calls std::swap explicitely)
X-Git-Tag: releases/gcc-4.6.0~613
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ad84c3fbbb836397f0f0b03c05840111fdbe461;p=thirdparty%2Fgcc.git

re PR libstdc++/47433 (libstdc++ parallel mode calls std::swap explicitely)

2011-02-11  Johannes Singler  <singler@kit.edu>

        PR libstdc++/47433
        * include/parallel/losertree.h
        (_LoserTreeUnguarded<>::__delete_min_insert):
        Add missing "using std::swap;", as for other variants.

From-SVN: r170047
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6f8dd42108f9..df669c6134a1 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-11  Johannes Singler  <singler@kit.edu>
+
+	PR libstdc++/47433
+	* include/parallel/losertree.h
+	(_LoserTreeUnguarded<>::__delete_min_insert):
+	Add missing "using std::swap;", as for other variants.
+
 2011-02-10  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* src/Makefile.am (sources): Add regex.cc.
diff --git a/libstdc++-v3/include/parallel/losertree.h b/libstdc++-v3/include/parallel/losertree.h
index ccc930b29fb4..8d7b137aaf56 100644
--- a/libstdc++-v3/include/parallel/losertree.h
+++ b/libstdc++-v3/include/parallel/losertree.h
@@ -775,6 +775,7 @@ namespace __gnu_parallel
       void
       __delete_min_insert(_Tp __key, bool)
       {
+        using std::swap;
 #if _GLIBCXX_ASSERTIONS
 	// no dummy sequence can ever be at the top!
 	_GLIBCXX_PARALLEL_ASSERT(_M_losers[0]._M_source != -1);