[Gtkradiant] [Bug 1087] Compile error with revision 46.

[justin]

Thanks.  My lack of experience with Subversion is showing.

It builds now but there are still a *lot* of warnings - do you want a
copy of my build output?

BTW.  The command should be:

svn revert libs/generic/functional.h

Regards,

    Justin.

Joseph, William wrote:
> Hi,
>
> You need to resolve a merge conflict in your working copy.
> The last time you updated from svn, it failed to merge the updates with
> your local changes and left conflict markers in your copy of
> generic/functional.h.
> You need to resolve the the conflict before building.
>
> You can also run this command to revert the file:
>
> svn revert generic/functional.h
>
> thanks,
>
> -SPoG
>
>
> -----Original Message-----
> From: gtkradiant-bounces at zerowing.idsoftware.com
> [mailto:gtkradiant-bounces at zerowing.idsoftware.com] On Behalf Of
> bugzilla-daemon at zerowing.idsoftware.com
> Sent: 10 April 2006 12:02
> To: gtkradiant at zerowing.idsoftware.com
> Subject: [Gtkradiant] [Bug 1087] Compile error with revision 46.
>
> http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=1087
>
>
>
>
>
> ------- Additional Comments From clancyj at tiscali.co.uk  2006-04-10 06:02
> -------
> I'm afraid revision 47 does not fix the problem.
>
> +++++++++
>
> g++ -pipe -DQ_NO_STLPORT -W -Wall -Wcast-align -Wcast-qual
> -Wno-unused-parameter
> -Wno-non-virtual-dtor -Wreorder -g -D_DEBUG -fno-exceptions -fno-rtti
> -fPIC
> -Ibuild/debug/libs -Ilibs -Ibuild/debug/include -Iinclude -c -o
> build/debug/plugins/entity/plugin.os plugins/entity/plugin.cpp
> libs/generic/functional.h:302: error: expected unqualified-id before
> '<<' token
> libs/generic/functional.h:309: error: invalid explicit specialization
> before '>'
> token
> libs/generic/functional.h:309: error: explicit specialization in
> non-namespace
> scope 'class TypeEqual<Other, True, False, Type>'
>
> etc...
>
> +++++++++++++++
>
>