Code: Select all
if g++ -DHAVE_CONFIG_H -I. -I. -I. -I./boost/1_33 -DHAVE_SDL=1 -DSDL_WINDOWING=1 -DHAVE_AL=1 -DHAVE_OGG -I/usr/include/python2.4 -DHAVE_PYTHON=1 -I./src -DBISON -g -O2 -pipe -falign-loops=2 -falign-jumps=2 -falign-functions=2 -I/usr/include/SDL -D_REENTRANT -pthread -pipe -MT src/gui/vegastrike-button.o -MD -MP -MF "src/gui/.deps/vegastrike-button.Tpo" -c -o src/gui/vegastrike-button.o `test -f 'src/gui/button.cpp' || echo './'`src/gui/button.cpp; \
then mv -f "src/gui/.deps/vegastrike-button.Tpo" "src/gui/.deps/vegastrike-button.Po"; else rm -f "src/gui/.deps/vegastrike-button.Tpo"; exit 1; fi
if g++ -DHAVE_CONFIG_H -I. -I. -I. -I./boost/1_33 -DHAVE_SDL=1 -DSDL_WINDOWING=1 -DHAVE_AL=1 -DHAVE_OGG -I/usr/include/python2.4 -DHAVE_PYTHON=1 -I./src -DBISON -g -O2 -pipe -falign-loops=2 -falign-jumps=2 -falign-functions=2 -I/usr/include/SDL -D_REENTRANT -pthread -pipe -MT src/gui/vegastrike-control.o -MD -MP -MF "src/gui/.deps/vegastrike-control.Tpo" -c -o src/gui/vegastrike-control.o `test -f 'src/gui/control.cpp' || echo './'`src/gui/control.cpp; \
then mv -f "src/gui/.deps/vegastrike-control.Tpo" "src/gui/.deps/vegastrike-control.Po"; else rm -f "src/gui/.deps/vegastrike-control.Tpo"; exit 1; fi
if g++ -DHAVE_CONFIG_H -I. -I. -I. -I./boost/1_33 -DHAVE_SDL=1 -DSDL_WINDOWING=1 -DHAVE_AL=1 -DHAVE_OGG -I/usr/include/python2.4 -DHAVE_PYTHON=1 -I./src -DBISON -g -O2 -pipe -falign-loops=2 -falign-jumps=2 -falign-functions=2 -I/usr/include/SDL -D_REENTRANT -pthread -pipe -MT src/gui/vegastrike-eventmanager.o -MD -MP -MF "src/gui/.deps/vegastrike-eventmanager.Tpo" -c -o src/gui/vegastrike-eventmanager.o `test -f 'src/gui/eventmanager.cpp' || echo './'`src/gui/eventmanager.cpp; \
then mv -f "src/gui/.deps/vegastrike-eventmanager.Tpo" "src/gui/.deps/vegastrike-eventmanager.Po"; else rm -f "src/gui/.deps/vegastrike-eventmanager.Tpo"; exit 1; fi
./src/cmd/base.h:216: error: expected unqualified-id before ‘<<’ token
./src/cmd/base.h:220: error: expected unqualified-id before ‘==’ token
./src/cmd/base.h:224: error: expected unqualified-id before ‘>>’ token
make: *** [src/gui/vegastrike-eventmanager.o] Error 1
The code in question is.
Code: Select all
// static void BaseInterface::beginElement(void *userData, const XML_Char *names, const XML_Char **atts);
<<<<<<< .mine
// void beginElement(const string &name, const AttributeList attributes);
// static void endElement(void *userData, const XML_Char *name);
void Load(const char * filename, const char * time_of_day, const char * faction);
=======
// void BaseInterface::beginElement(const string &name, const AttributeList attributes);
// static void BaseInterface::endElement(void *userData, const XML_Char *name);
void Load(const char * filename, const char * time_of_day, const char * faction);
>>>>>>> .r10426
Are those 2 Load lines required?