summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsingler <singler@138bc75d-0d04-0410-961f-82ee72b054a4>2011-01-24 16:44:30 +0000
committersingler <singler@138bc75d-0d04-0410-961f-82ee72b054a4>2011-01-24 16:44:30 +0000
commit510cc136d2acbc36483fddf2e038ea97ed9a4c5d (patch)
tree526d8f21f83d4c43e9eec025dbc3d6caf4990877
parent2a98fe0d2a0fca1d059ae9dbaa6bfe15ebd083a3 (diff)
downloadgcc-510cc136d2acbc36483fddf2e038ea97ed9a4c5d.tar.gz
2011-01-24 Johannes Singler <singler@kit.edu>
PR libstdc++/47437 * include/parallel/multiway_merge.h (_UnguardedIterator): Remove useless "mutable" from reference declaration. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@169166 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/include/parallel/multiway_merge.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index be05727fd9e..e364bec617f 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 1baf76beb9c..0fd3da2d656 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.