From: Johannes Singler <singler@kit.edu>
Date: Mon, 24 Jan 2011 16:44:30 +0000 (+0000)
Subject: re PR libstdc++/47437 (libstdc++ parallel mode: multiway_merge does not compile)
X-Git-Tag: releases/gcc-4.6.0~1036
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2e064a9c0363fe0cc68f1bfe2e272f151328833;p=thirdparty%2Fgcc.git

re PR libstdc++/47437 (libstdc++ parallel mode: multiway_merge does not compile)

2011-01-24  Johannes Singler  <singler@kit.edu>

        PR libstdc++/47437
        * include/parallel/multiway_merge.h (_UnguardedIterator):
        Remove useless "mutable" from reference declaration.

From-SVN: r169166
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index be05727fd9ee..e364bec617f8 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-24  Johannes Singler  <singler@kit.edu>
+
+        PR libstdc++/47437
+        * include/parallel/multiway_merge.h (_UnguardedIterator):
+        Remove useless "mutable" from reference declaration.
+
 2011-01-21  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/bits/c++config (_GLIBCXX_EXPORT_TEMPLATE): Remove.
diff --git a/libstdc++-v3/include/parallel/multiway_merge.h b/libstdc++-v3/include/parallel/multiway_merge.h
index 1baf76beb9ca..0fd3da2d656c 100644
--- a/libstdc++-v3/include/parallel/multiway_merge.h
+++ b/libstdc++-v3/include/parallel/multiway_merge.h
@@ -143,7 +143,7 @@ namespace __gnu_parallel
       /** @brief Current iterator __position. */
       _RAIter _M_current;
       /** @brief _Compare. */
-      mutable _Compare& __comp;
+      _Compare& __comp;
 
     public:
       /** @brief Constructor. Sets iterator to beginning of sequence.