Re: Error on make (Gpsim)

Thanks,
I remember hacking on bitlog.cc per your instructions but I didn't
realize that was causing this problem.
I'm not the sharpest knife in the drawer but I can spread butter. =)
Thanks again,
Wayne
On Tue, 2005-09-13 at 21:25 -0700, Scott Dattalo wrote:
> > I updated from cvs on 09/13/05 06:22 pm CST and the make file halts with
> > this error.
> >
> >
> > bitlog.cc: In constructor `ThreeStateEventLogger::ThreeStateEventLogger
> > (unsigned int)':
> > bitlog.cc:246: error: expected primary-expression before '<<' token
> 
> It looks to me there are conflicts in bitlog.cc. Try this: delete
> src/bitlog.cc and then update your gpsim source from CVS. And by update, I
> mean typing this command:
> 
> cvs -z3 -d:pserver:[email protected]:/cvsroot/gpsim update
> 
> 
> In general, when CVS updates the code it will list each file and print the
> letter 'P' in front of files that have been patched, i.e. all files that
> have been brought up to date. If a particular file has a conflict, then
> the letter 'C' will be printed in front of the file name. Now, the only
> way you can get conflicts (I think) is if you made changes to your local
> copy at some point. And at line 246 of bitlog.cc I see there was a recent
> change that I made and had instructed you to make too. So - I think the
> mystery is solved!
> 
> Scott
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [email protected]
> For additional commands, e-mail: [email protected]
>