[CinCV TNG] compile error on GreyCstoration

Johannes Sixt j6t at kdbg.org
Tue Nov 17 19:34:59 CET 2015


Am 17.11.2015 um 01:04 schrieb edouard chalaron:
> Hi
>
> Did a git pull this morning and ended up with this
> Cheers
> Ed
>
> Making all in greycstoration
> make[3]: Entering directory
> '/home/edouard/cinelerra-cv/plugins/greycstoration'
> make  all-am
> make[4]: Entering directory
> '/home/edouard/cinelerra-cv/plugins/greycstoration'
>    CXX      greycstorationwindow.lo
> In file included from greycstoration.h:9:0,
>                   from greycstorationwindow.h:10,
>                   from greycstorationwindow.C:3:
> greycstorationwindow.h:2:0: error: unterminated #ifndef
> #ifndef GREYCSTORATIONWINDOW_H
> ^
> In file included from greycstorationwindow.h:10:0,
>                   from greycstorationwindow.C:3:
> greycstoration.h:460:9: error: invalid suffix
> "d6565ab4c581568652ee84d3c5f3a008004496c" on integer constant
>  >>>>>>> 9d6565ab4c581568652ee84d3c5f3a008004496c
>           ^

Looks like an unresolved merge conflict. You must resolve.

-- Hannes



More information about the Cinelerra mailing list