[Qgis-developer] error building #6914

[Martin Dobias]

Hi Paolo,

that's surely a conflict marked by SVN in your (modified) qgsgrass.h.
To remove the conflict, revert to original file from SVN:
svn revert qgsgrass.h

Martin

On 4/26/07, Paolo Cavallini <cavallini at faunalia.it> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi all.
> Today qgis does not compile:
>
> [ 69%] Building CXX object
> src/providers/grass/CMakeFiles/qgisgrass.dir/qgsgrassprovider.o
> /home/paolo/Desktop/buildpackage/qgis/src/providers/grass/qgsgrass.h:166:
> error: expected unqualified-id before '<<' token
> /home/paolo/Desktop/buildpackage/qgis/src/providers/grass/qgsgrass.h:168:
> error: expected unqualified-id before '==' token
> /home/paolo/Desktop/buildpackage/qgis/src/providers/grass/qgsgrass.h:175:
> error: expected unqualified-id before '>>' token
> make[2]: ***
> [src/providers/grass/CMakeFiles/qgisgrass.dir/qgsgrassprovider.o] Error 1
> make[1]: *** [src/providers/grass/CMakeFiles/qgisgrass.dir/all] Error 2
>
> Any hints?
> All the best.
> pc
> - --
> Paolo Cavallini
> http://www.faunalia.it/pc
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.6 (GNU/Linux)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
>
> iD8DBQFGMFkm/NedwLUzIr4RAgaeAKCa+VBIh8NGLahqLu7DykT9PkSCZgCggUbC
> PMaVr/AMFWon+SMFjBoPmb4=
> =eFmz
> -----END PGP SIGNATURE-----
> _______________________________________________
> Qgis-developer mailing list
> Qgis-developer at lists.qgis.org
> http://lists.qgis.org/cgi-bin/mailman/listinfo/qgis-developer
>