error compiling 3.0.x in ov-base-scalar.h (mingw32)

[Benjamin Lindner]

Jaroslav Hajek wrote:
> On Sun, Dec 28, 2008 at 1:43 PM, Benjamin Lindner <lindnerben at gmx.net> wrote:
>> Hello,
>>
>> I did a build of current 3.0.x HG sources for mingw32 and compilation fails
>> with the error
>>
>> mingw32-g++-4.3.0-dw2 -c -march=i686 -mtune=generic -I.
>> -I/octaveforge_mingw32/octave/octave-3.0.x/src -I.. -I../liboctave -I../src
>> -I../libcruft/misc -I/octaveforge_mingw32/octave/octave-3.0.x
>> -I/octaveforge_mingw32/octave/octave-3.0.x/liboctave
>> -I/octaveforge_mingw32/octave/octave-3.0.x/src
>> -I/octaveforge_mingw32/octave/octave-3.0.x/libcruft/misc -DHAVE_CONFIG_H
>> -mieee-fp -Wall -W -Wshadow -Wold-style-cast -D_DLL -O2 -Wall
>> /octaveforge_mingw32/octave/octave-3.0.x/src/bitfcns.cc -o bitfcns.o
>> In file included from
>> d:/files/admin/octaveforge_svn/trunk/octave-forge/admin/Windows/mingw32/octave/octave-3.0.x/src/ov-base-int.h:39,
>>                 from
>> d:/files/admin/octaveforge_svn/trunk/octave-forge/admin/Windows/mingw32/octave/octave-3.0.x/src/ov-intx.h:36,
>>                 from
>> d:/files/admin/octaveforge_svn/trunk/octave-forge/admin/Windows/mingw32/octave/octave-3.0.x/src/ov-uint64.h:38,
>>                 from
>> d:/files/admin/octaveforge_svn/trunk/octave-forge/admin/Windows/mingw32/octave/octave-3.0.x/src/bitfcns.cc:33:
>> d:/files/admin/octaveforge_svn/trunk/octave-forge/admin/Windows/mingw32/octave/octave-3.0.x/src/ov-base-scalar.h:93:
>> error: 'octave_value octave_base_scalar<ST>::reshape(const dim_vector&)
>> const' cannot be overloaded
>> d:/files/admin/octaveforge_svn/trunk/octave-forge/admin/Windows/mingw32/octave/octave-3.0.x/src/ov-base-scalar.h:90:
>> error: with 'octave_value octave_base_scalar<ST>::reshape(const dim_vector&)
>> const'
>>
>> Looking into ov-base-scalar.h I see that there is indeed a method reshape(),
>> but it's defined *twice*
>>
>> <snip>
>>   octave_value reshape (const dim_vector& new_dims) const
>>       { return array_value ().reshape (new_dims); }
>>
>>   octave_value reshape (const dim_vector& new_dims) const
>>       { return array_value ().reshape (new_dims); }
>> </snip>
>>
>> and the changelog tells that the method reshape() was added indeed twice in
>> rev 7619 and 7621
>>
>> Is this intentional?
>>
>> benjamin
>>
> 
> Where did you get the sources? The duplicated 7621 was backed out by 7632.
> 
> 

Oops, I must have messed up when merging updates into my local build tree.
Sorry for the noise

benjamin