On Fri, Mar 6, 2009 at 1:15 PM, Tero Koskinen <[email protected]> wrote:
> Hi,
>
> It seems that merge_content.hh is missing #include "paths.hh".
This is quite likely because I moved content_merge_workspace_adaptor to
merge_content.{cc,hh} from work.{cc,hh} in
dbf38fd6d5265df467a88a468d110bcc039c2367. Just to confirm, can you try
building add275e5fdb0824361d4a2fa15049281e7ada52e please?
I'm not sure why I don't see the problem here though, gcc 4.1.2 seems
perfectly happy on a fresh checkout?
When compiling rev d24b59732a5b3293592457cba013c8f8b716a875, I get error:
> if g++ -I. -I. -I. -I/usr/local/include
> -I/home/tkoskine/libraries/bo
> tan-18/include -I/usr/local//include -I/usr/local/include -g
> -I/usr/local/i
> nclude -g -O2 -Wall -W -Wno-unused -MT merge_roster.o -MD -MP -MF
> "$depbase.Tpo
> " -c -o merge_roster.o merge_roster.cc; \
> then mv -f "$depbase.Tpo" "$depbase.Po"; else rm -f "$depbase.Tpo";
> exit
> 1; fi
> In file included from merge_roster.hh:18,
> from merge_roster.cc:12:
>
Any chance that 'fi' is not closing the preceeding if but was a 'file...'
something or other line that was chopped of and might have a bit more info?
Cheers,
Derek
_______________________________________________
Monotone-devel mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-devel
