gnupic: Re: [gnupic] Error on make (gpsim)
Subject:
Re: [gnupic] Error on make (Gpsim)
From:
"Scott Dattalo" ####@####.####
Date:
14 Sep 2005 05:25:36 +0100
Message-Id: <61809.67.118.98.217.1126671933.squirrel@67.118.98.217>
> 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 ####@####.#### 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
