Patchwork [libstdc++-v3,parallel,mode] Do not declare a mutable reference

login
register
mail settings
Submitter Johannes Singler
Date Jan. 24, 2011, 4:47 p.m.
Message ID <4D3DAD3D.7040103@kit.edu>
Download mbox | patch
Permalink /patch/80212/
State New
Headers show

Comments

Johannes Singler - Jan. 24, 2011, 4:47 p.m.
Mainline was failing to compile the parallel mode multiway merge 
facilities because of a spurious mutable reference.

Test on x86_64-unknown-linux-gnu: no regressions.

Pre-approved by Jonathan Wakely, committed.

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

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

Johannes
Benjamin Kosnik - Jan. 24, 2011, 6:09 p.m.
> Mainline was failing to compile the parallel mode multiway merge 
> facilities because of a spurious mutable reference.

Ah ha! You beat me to it. Thanks.

-benjamin

Patch

Index: include/parallel/multiway_merge.h
===================================================================
--- include/parallel/multiway_merge.h	(revision 169160)
+++ include/parallel/multiway_merge.h	(working copy)
@@ -143,7 +143,7 @@ 
       /** @brief Current iterator __position. */
       _RAIter _M_current;
       /** @brief _Compare. */
-      mutable _Compare& __comp;
+      _Compare& __comp;
 
     public:
       /** @brief Constructor. Sets iterator to beginning of sequence.