From a2e064a9c0363fe0cc68f1bfe2e272f151328833 Mon Sep 17 00:00:00 2001 From: Johannes Singler Date: Mon, 24 Jan 2011 16:44:30 +0000 Subject: [PATCH] re PR libstdc++/47437 (libstdc++ parallel mode: multiway_merge does not compile) 2011-01-24 Johannes Singler PR libstdc++/47437 * include/parallel/multiway_merge.h (_UnguardedIterator): Remove useless "mutable" from reference declaration. From-SVN: r169166 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/parallel/multiway_merge.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + + PR libstdc++/47437 + * include/parallel/multiway_merge.h (_UnguardedIterator): + Remove useless "mutable" from reference declaration. + 2011-01-21 Benjamin Kosnik * 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.