compile errors need some help

[onied]

so i grabbed the CVS update earlier today and when tring to recompile everything i keep getting this for output


# make
make all-recursive
make[1]: Entering directory `/root/showeq'
Making all in maps
make[2]: Entering directory `/root/showeq/maps'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/root/showeq/maps'
Making all in src
make[2]: Entering directory `/root/showeq/src'
g++ -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/qt/3/include -I/usr/X11R6/include -DPKGDATADIR=\"/usr/local/share/showeq/\" -I/usr/include/pcap -D_REENTRANT -O2 -Wall -g -ggdb -DDEBUG -finline-functions -DQT_THREAD_SUPPORT=1 -DDISPLAY_ICONS=false -DICON_DIR=\"/eq-icons/\" -c main.cpp
In file included from interface.h:32,
from main.cpp:39:
everquest.h:475: error: parse error before `<<' token
In file included from interface.h:32,
from main.cpp:39:
everquest.h:479:9: too many decimal points in number
everquest.h:481: error: missing ';' before right brace
make[2]: *** [main.o] Error 1
make[2]: Leaving directory `/root/showeq/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/root/showeq'
make: *** [all-recursive-am] Error 2

[onied]

hrm ok i seem to have fixed it.

It seems that everquest.h file from CVS has some uncleaned up changes in it.

i just removed lines 475 - 480 and it works.

[mythos]

I had the same issue,

solution thanks to ksmith from #Showeq


<ksmith> "delete everquest.h and get it from cvs again
<ksmith> that is a failed patch
<ksmith> the copy in cvs should be correct"

I just deleted the whole /showeq then cvs'd again and it compiles like a champ.

[onied]

yeah my fix just removed the changes and never really fixed anything. it would compile and run but was still giving same errors as it was before updating. *sigh*

removing everquest.h and re-getting it from CVS works though.
must not h ave like updating that file for some reason.

[Cryonic]

major reason it would fail to update is if that file had been modified by hand so that it didn't match the version in CVS that your system thought it was...

[purple]

When you do your cvs update, look for conflicts and you'll be able to see when it is going to happen. A conflict looks something like:
C src/everquest.h

When you get a conflict, CVS puts both versions into the file like this:
<<<<<<<<<
Original stuff that was in your file that you probably changed by hand.
========
Updated stuff from cvs that someone else checked in that cvs is trying to apply but can't, because you changed it by hand a bit differently than how it is in cvs
>>>>>>>>>

You have a choice here. You can either nuke the file and re-cvs update, losing your local changed or resolve the conflict by hand. If you're just using read only anoncvs to get things built and running, then nuking the file and redoing cvs update is always gonna be fine. But if you're actually making changes or trying to fix things, you may not want to kill your file. In that case, just hand apply the changes that you see fit using your local copy and the repository copy that cvs put into the file for you.

If you ignore the conflict and try to compile, you'll get compiler errors because what cvs puts into the file isn't code and won't compile.