[boost] Re: String Algo bug.

From: David Abrahams (dave_at_[hidden])
Date: 2004-07-21 06:19:38

Stefan Slapeta <stefan_nospam__at_[hidden]> writes:

> Not necessary. Could anybody comment this fix (...and apply it if it's
> ok)? Tests are fine.
> BTW, the replace test doesn't compile at all with VC7.1+STLPort. I'll
> have a look on that later.
>
> Stefan

Applied, thanks.  Please post patches as attachments in future.

>
> --- find_iterator.hpp	15 Jul 2004 21:48:25 -0000	1.8
> +++ find_iterator.hpp	19 Jul 2004 14:41:19 -0000
> @@ -136,14 +136,10 @@
>               // comparison
>               bool equal( const find_iterator& Other ) const
>               {
> -                return
> +                return eof() || Other.eof() ? eof() == Other.eof() :
>                       (
>                           m_Match==Other.m_Match &&
>                           m_End==Other.m_End
> -                    )
> -                    ||
> -                    (
> -                        eof() && Other.eof()
>                       );
>               }
>
> @@ -301,15 +297,11 @@
>               // comparison
>               bool equal( const split_iterator& Other ) const
>               {
> -                return
> +                return eof() || Other.eof() ? eof() == Other.eof() :
>                       (
>                           m_Match==Other.m_Match &&
>                           m_Next==Other.m_Next &&
>                           m_End==Other.m_End
> -                    )
> -                    ||
> -                    (
> -                        eof() && Other.eof()
>                       );
>               }

-- 
Dave Abrahams
Boost Consulting
http://www.boost-consulting.com