Re: can't compile

> I deleted everything, checked out again and now it works.
>
>  Thanks.
>  Miguel
>
>  Dan Stowell escreveu:
>
>
> > Hi -
> >
> > See the "merge conflicts" information here:
> > http://svnbook.red-bean.com/en/1.0/ch03s05.html
> > You have local changes which svn doesn't know how to merge in with the
> > remote changes.
> >
> > Dan
> >
> > 2009/4/25, Miguel Negrao
> <miguel.negrao@...>:
> >
> > > Hi
> > >
> > >  I just updated from svn and I can't compile the sc class library. I get
> an
> > > error EZKnob.sc
> > >
> > >  I opened the file and found this strange lines:
> > >
> > >  <<<<<<< .mine
> > >                this.prSetViewParams;
> > >
> > >  =======
> > >
> > >                this.prSetViewParams;
> > >  >>>>>>> .r9115
> > >        }
> > >
> > >  the error reported:
> > >
> > >  • ERROR: Parse error
> > >   in file '/Common/GUI/Base/EZKnob.sc'
> > >   line 101 char 7:
> > >  <<<<<<<• .mine
> > >                this.prSetViewParams;
> > >  -----------------------------------
> > >  • ERROR: file '/Common/GUI/Base/EZKnob.sc' parse failed
> > >  error parsing
> > >
> > >
> > >  Btw, is there a way to turn off the warnings "FunctionDef contains
> variable
> > > declarations and so will not be inlined." on class compilation ?
> > >
> > >  thanks
> > >  --
> > >  Miguel Negrão // ZLB
> > >  http://www.friendlyvirus.org/artists/zlb/
> > >
> > >  _______________________________________________
> > >  sc-dev mailing list
> > >
> > >  info (subscription, etc.):
> > >
> http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
> > >  archive:
> http://www.listarc.bham.ac.uk/marchives/sc-dev/
> > >  search:
> http://www.listarc.bham.ac.uk/lists/sc-dev/search/
> > >
> > >
> >
> >
> >
>
>
>  --
>  Miguel Negrão // ZLB
>  http://www.friendlyvirus.org/artists/zlb/
>
>  _______________________________________________
>  sc-dev mailing list
>
>  info (subscription, etc.):
> http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
>  archive: http://www.listarc.bham.ac.uk/marchives/sc-dev/
>  search: http://www.listarc.bham.ac.uk/lists/sc-dev/search/
>