Re: [Monotone-devel] Broken build?

[William Uther]

On 03/04/2008, at 1:11 PM, Timothy Brownawell wrote:
> On Wed, 2008-04-02 at 22:16 +1100, William Uther wrote:
> > Hi all,
> >
> >   It seems that something has recently broken the build (for non-
> > linux boxes).  The last bit of the failed build looks like this:
> >
> > if g++ -DLOCALEDIR=\"/usr/local/monotone/share/locale\" -
> > DHAVE_CONFIG_H -I. -I. -I.  -I./lua -I./pcre  -I/sw/include    -g - 
> > O2 -
> > Wall -W -Wno-unused -fno-strict-aliasing -MT mtn-vocab.o -MD -MP -MF
> > ".deps/mtn-vocab.Tpo" -c -o mtn-vocab.o `test -f 'vocab.cc' || echo
> > './'`vocab.cc; \
> >         then mv -f ".deps/mtn-vocab.Tpo" ".deps/mtn-vocab.Po"; else rm -f
> > ".deps/mtn-vocab.Tpo"; exit 1; fi
> > vocab.cc:213: error: ‘id’ is not a template type
> >
> > Which makes me suspect the recent id encoding changes.  Compiler is
> > Apple standard:
> >
> > % g++ --version
> > i686-apple-darwin9-g++-4.0.1 (GCC) 4.0.1 (Apple Inc. build 5465)
>
> Does this patch make it work? It at least doesn't make it not compile
> here, and it looks more like the verify() specialization earlier in  
> the
> file.
>
> --- vocab.cc    09f8ef53a74e5bc5989d0e6155d2daca2e124dd1
> +++ vocab.cc    321f9118a2194a0a8b3314af70836e4ac760039f
> @@ -211,7 +211,7 @@ template <>
>  * string.
>  */
> template <>
> -void dump <class id>(id const & obj, std::string & out)
> +void dump (id const & obj, std::string & out)
> {
>   out = encode_hexenc(obj());
> }

Yup - that appears to work.  :)

Will       :-}