[ardour-dev] Re: Latest CVS

[Jan Depner]

Boy am I getting lazy ;-)  I just looked at curve.h.  It looks like
Jesse and Taybin ran into each other in CVS:


<<<<<<< curve.h
/* $Id: curve.gen_h,v 1.2 2004/08/06 23:02:01 taybin Exp $ */
=======
/* $Id: curve.h,v 1.5 2004/08/10 08:29:42 essej Exp $ */
>>>>>>> 1.5


I just removed the 1.2 line and the <<<===>>>> warnings and it compiles
fine (so far, still in progress).


Jan


On Mon, 2004-08-16 at 16:47, Jan Depner wrote:
> Paul,
> 
> 	I get the following with the latest.  I did make distclean and sh
> autogen prior to running configure:
> 
> configure: configuring in templates
> configure: WARNING: no configuration information is in templates
> 
> 
> When I make it I get:
> 
> In file included from curve.cc:3:
> ../gtk--/curve.h:6: error: syntax error before `<<' token
> In file included from /usr/include/c++/3.3.2/string:46,
>                  from ../gtk--/base.h:28,
>                  from ../gtk--/object.h:30,
>                  from ../gtk--/widget.h:32,
>                  from ../gtk--/container.h:27,
>                  from ../gtk--/box.h:28,
>                  from ../gtk--/curve.h:31,
>                  from curve.cc:3:
> /usr/include/c++/3.3.2/bits/stringfwd.h:55: error: syntax error before
> `<'
>    token
> /usr/include/c++/3.3.2/bits/stringfwd.h:58: confused by earlier errors,
> bailing out
> make[6]: *** [curve.o] Error 1
> make[6]: Leaving directory `/data2/sound2/ardour/libs/gtkmm/src/gtk--'
> 
> 
> gcc 3.3.2 on FC1
> 
> Jan
> 
> _______________________________________________
> ardour-dev mailing list
> ardour-dev at lists.ardour.org
> http://lists.ardour.org/listinfo.cgi/ardour-dev-ardour.org