[aspell-devel] 0.60.4: patch for very minor cut-n-paste error in primes.hpp

[Tim Mooney]

[I'm not subscribed to aspell-devel, please Cc: me on any replies]

I mentioned this minor problem on this list about a year ago, but I
never sent a patch for it.  My bad.

There's a cut-n-paste error in primes.hpp, operator-- for the
const_reverse_iterator has two return statements.  The second is obviously
unreachble, and some compilers warn about that.

The fix is to get rid of the unreachable "return *this;":


--- aspell-0.60.4.orig/modules/speller/default/primes.hpp       2001-11-29 
21:55:48.000000000 -0600
+++ aspell-0.60.4/modules/speller/default/primes.hpp    2005-10-22 
20:58:48.000000000 -0500
@@ -92,7 +92,7 @@
       const_reverse_iterator& operator++ () {const_iterator::operator--(); 
return *this;}
       const_reverse_iterator operator++ (int){return 
const_iterator::operator--(1);}
       const_reverse_iterator& operator-- () {const_iterator::operator++(); 
return *this;}
-      const_reverse_iterator operator-- (int) {return 
const_iterator::operator++(1); return *this;}
+      const_reverse_iterator operator-- (int) {return 
const_iterator::operator++(1);}

       const_reverse_iterator& jump(size_type p) {
        pos = p;


Tim
--
Tim Mooney                              address@hidden
Information Technology Services         (701) 231-1076 (Voice)
Room 242-J6, IACC Building              (701) 231-8541 (Fax)
North Dakota State University, Fargo, ND 58105-5164