Greetings:

  A couple of errors showed up in this morning's CVS SConstruct file. 
GCC 3.2.2 doesn't like C++ style commenting, so lines with either <<<< 
or >>>> stop the show. Ditto for lines that look like =====. Commenting 
out that stuff in the usual fashion fixed it, compile proceeded normally 
with no errors (default scons values).

Best,

dp




-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

Dave Phillips wrote:

>  A couple of errors showed up in this morning's CVS SConstruct file. GCC 
> 3.2.2 doesn't like C++ style commenting, so lines with either <<<< or 
>  >>>> stop the show. Ditto for lines that look like =====. Commenting 
> out that stuff in the usual fashion fixed it, compile proceeded normally 
> with no errors (default scons values).

The <<<<, >>>>, and ==== lines are actually not comments, but CVS conflicts
as a result of you locally editing the file and then running cvs update.
Update again with 'update -d -C' and then delete any backup files created
by CVS with 'rm -i `find . -name ".#*" -print`'.


-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

On Mon, 23 May 2005 14:22:48 +0200, Dave Phillips   
wrote:

> Greetings:
>
>   A couple of errors showed up in this morning's CVS SConstruct file.  
> GCC 3.2.2 doesn't like C++ style commenting, so lines with either <<<<  
> or >>>> stop the show. Ditto for lines that look like =====.

that looks like cvs update conflicts rather than comments
A cvs update -c should fix it.

G


-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

Istvan Varga wrote:

> Dave Phillips wrote:
>
>>  A couple of errors showed up in this morning's CVS SConstruct file. 
>> GCC 3.2.2 doesn't like C++ style commenting, so lines with either 
>> <<<< or  >>>> stop the show. Ditto for lines that look like =====. 
>> Commenting out that stuff in the usual fashion fixed it, compile 
>> proceeded normally with no errors (default scons values).
>
>
> The <<<<, >>>>, and ==== lines are actually not comments, but CVS 
> conflicts
> as a result of you locally editing the file and then running cvs update.
> Update again with 'update -d -C' and then delete any backup files created
> by CVS with 'rm -i `find . -name ".#*" -print`'.

Interesting. I don't recall editing SConstruct any time recently, but 
I'll be sure to add the -C option to CVS update from now on.

Thanks again ! :)

Best,

dp




-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net