aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Singler <singler@kit.edu>2011-02-11 10:11:41 +0000
committerJohannes Singler <singler@gcc.gnu.org>2011-02-11 10:11:41 +0000
commit0ad84c3fbbb836397f0f0b03c05840111fdbe461 (patch)
tree0eecb0fba254f77f73036adb909a5c4523fec862
parent6dd2a13c9e7cf3aec83a33fe2a866c22364a58ac (diff)
downloadgcc-0ad84c3fbbb836397f0f0b03c05840111fdbe461.zip
gcc-0ad84c3fbbb836397f0f0b03c05840111fdbe461.tar.gz
gcc-0ad84c3fbbb836397f0f0b03c05840111fdbe461.tar.bz2
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
-rw-r--r--libstdc++-v3/ChangeLog7
-rw-r--r--libstdc++-v3/include/parallel/losertree.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6f8dd42..df669c6 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 ccc930b..8d7b137 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);