[GRASS-dev] r.watershed not compiling

OK. Now that William has helped catch a stupid error on my part, I can report a real problem with compilation on the Mac.

The new improved r.watershed is not compiling. Here is the error.

Finished compilation: Wed Feb 25 20:40:50 MST 2009
make: *** [default] Error 1
cmb-MBP-2:grass6_src cmbarton$ cd /Users/cmbarton/grass_dev/grass6_src/raster/r.watershed/front
cmb-MBP-2:front cmbarton$ make
gcc -I/Users/cmbarton/grass_dev/grass6_src/dist.i386-apple-darwin9.6.0/include -arch i386 -Os -DPACKAGE=\""grassmods"\" -I/Users/cmbarton/grass_dev/grass6_src/dist.i386-apple-darwin9.6.0/include -o OBJ.i386-apple-darwin9.6.0/main.o -c main.c
main.c: In function ‘main’:
main.c:244: error: syntax error before ‘<<’ token
make: *** [OBJ.i386-apple-darwin9.6.0/main.o] Error 1
cmb-MBP-2:front cmbarton$

I am very much looking forward to trying this in GRASS 6.5 and appreciate the effort to backport the multiflow direction improvements. I hope that this issue can be corrected.

Michael

Michael wrote:

main.c: In function ‘main’:
main.c:244: error: syntax error before ‘<<’ token
make: *** [OBJ.i386-apple-darwin9.6.0/main.o] Error 1

check for

<<<<<<<<<<<<
....

....

in the source code from a svn merge conflict.

Hamish

That was it. Thanks.

Michael

On Feb 25, 2009, at 9:11 PM, Hamish wrote:

Michael wrote:

main.c: In function ‘main’:
main.c:244: error: syntax error before ‘<<’ token
make: *** [OBJ.i386-apple-darwin9.6.0/main.o] Error 1

check for

<<<<<<<<<<<<
....

....

in the source code from a svn merge conflict.

Hamish