On Jun 14, 2012, at 08:30 PM, Dmitrijs Ledkovs wrote:
>Barry, can you please review this package as it has interesting history and >you were the last one to merge it.
What a mess! Sigh. Just one thing stands out.
=== modified file 'include/vigra/box.hxx' --- include/vigra/box.hxx 2011-02-20 23:21:40 +0000 +++ include/vigra/box.hxx 2012-06-14 20:29:21 +0000 > @@ -388,7 +388,7 @@ > if(r.isEmpty()) > return *this; > if(isEmpty()) > - return operator=(r); > + return this->operator=(r); > > for(unsigned int i = 0; i < DIMENSION; ++i) > { > @@ -421,7 +421,7 @@ > if(isEmpty()) > return *this; > if(r.isEmpty()) > - return operator=(r); > + return this->operator=(r); > > for(unsigned int i = 0; i < DIMENSION; ++i) > {
=== modified file 'include/vigra/random_forest/rf_ridge_split.hxx' [...]
Why are these being modified in the source tree? Is this just quilt/bzr artifacts? Does it actually build with these changes? Are they in a quilt patch?
« Back to merge proposal
On Jun 14, 2012, at 08:30 PM, Dmitrijs Ledkovs wrote:
>Barry, can you please review this package as it has interesting history and
>you were the last one to merge it.
What a mess! Sigh. Just one thing stands out.
=== modified file 'include/ vigra/box. hxx' vigra/box. hxx 2011-02-20 23:21:40 +0000 vigra/box. hxx 2012-06-14 20:29:21 +0000
--- include/
+++ include/
> @@ -388,7 +388,7 @@
> if(r.isEmpty())
> return *this;
> if(isEmpty())
> - return operator=(r);
> + return this->operator=(r);
>
> for(unsigned int i = 0; i < DIMENSION; ++i)
> {
> @@ -421,7 +421,7 @@
> if(isEmpty())
> return *this;
> if(r.isEmpty())
> - return operator=(r);
> + return this->operator=(r);
>
> for(unsigned int i = 0; i < DIMENSION; ++i)
> {
=== modified file 'include/ vigra/random_ forest/ rf_ridge_ split.hxx'
[...]
Why are these being modified in the source tree? Is this just quilt/bzr
artifacts? Does it actually build with these changes? Are they in a quilt
patch?