diff options
| author | Johannes Singler <singler@kit.edu> | 2011-01-24 16:44:30 +0000 |
|---|---|---|
| committer | Johannes Singler <singler@gcc.gnu.org> | 2011-01-24 16:44:30 +0000 |
| commit | a2e064a9c0363fe0cc68f1bfe2e272f151328833 (patch) | |
| tree | 526d8f21f83d4c43e9eec025dbc3d6caf4990877 | |
| parent | 789abad8f3c95b6e6789f21a853601aab94ca6e6 (diff) | |
| download | gcc-a2e064a9c0363fe0cc68f1bfe2e272f151328833.zip gcc-a2e064a9c0363fe0cc68f1bfe2e272f151328833.tar.gz gcc-a2e064a9c0363fe0cc68f1bfe2e272f151328833.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/parallel/multiway_merge.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index be05727..e364bec 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 1baf76b..0fd3da2 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. |