Package: vegastrike
Version: 0.4.3-4
Severity: important
Tags: patch

Your package fails to build with G++ 4.1.  I'm filing this bug as
important for now, but when 4.1 will be the default compiler in
unstable (probably in a few weeks) I'll upgrade this to serious.

A patch is attached.


> Automatic build of vegastrike_0.4.3-4 on bigsur by sbuild/mips 1.106
...
> make[5]: Entering directory 
> `/build/tbm/vegastrike-0.4.3/work/vegastrike-0.4.3/src/cmd/ai'
> if g++ -DHAVE_CONFIG_H -I. -I. -I../../..   -DHAVE_SDL=1 -DSDL_WINDOWING=1    
>     -DHAVE_SDL=1 -DSDL_WINDOWING=1      -DHAVE_AL=1  -DHAVE_OGG   
> -DDATA_DIR=\"/usr/share/games/vegastrike\"  -I/usr/include/python2.3 
> -DHAVE_PYTHON=1  -DUSE_BOOST_131=1 -I../../../src/boost129  -I../../../src   
> -pipe  -O2 -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 
> -Wa,-xgot -I/usr/include/SDL -D_REENTRANT -pthread -pipe -MT comm_ai.o -MD 
> -MP -MF ".deps/comm_ai.Tpo" -c -o comm_ai.o comm_ai.cpp; \
>       then mv -f ".deps/comm_ai.Tpo" ".deps/comm_ai.Po"; else rm -f 
> ".deps/comm_ai.Tpo"; exit 1; fi
> ../../../src/cmd/collection.h:62: error: extra qualification 
> 'UnitCollection::UnitIterator::' on member 'operator='
> ../../../src/cmd/collection.h:96: error: extra qualification 
> 'UnitCollection::ConstIterator::' on member 'operator='
> ../../../src/cmd/weapon_xml.h:35: error: extra qualification 'weapon_info::' 
> on member 'weapon_info'
> ../../../src/cmd/script/flightgroup.h:84: error: extra qualification 
> 'Flightgroup::' on member 'operator='
> comm_ai.cpp: In function 'void GetMadAt(Unit*, Unit*, int)':
> comm_ai.cpp:124: warning: converting to 'int' from 'float'
> make[5]: *** [comm_ai.o] Error 1


--- ./src/cmd/script/flightgroup.h~     2006-03-21 19:19:20.000000000 +0000
+++ ./src/cmd/script/flightgroup.h      2006-03-21 19:19:27.000000000 +0000
@@ -81,7 +81,7 @@
   Flightgroup (Flightgroup & other) {
          *this = other;
   }
-  Flightgroup& Flightgroup::operator = (Flightgroup & other);
+  Flightgroup& operator = (Flightgroup & other);
   ~Flightgroup();
 };
 
--- ./src/cmd/collection.h~     2006-03-21 19:18:33.000000000 +0000
+++ ./src/cmd/collection.h      2006-03-21 19:19:09.000000000 +0000
@@ -59,7 +59,7 @@
         GetNextValidUnit();
     }
     UnitIterator( const UnitIterator& orig ) : pos(orig.pos) { }
-    UnitIterator& UnitIterator::operator=( const UnitIterator& orig ) {
+    UnitIterator& operator=( const UnitIterator& orig ) {
         pos = orig.pos; return *this;
     }
     ~UnitIterator() {
@@ -93,7 +93,7 @@
     ConstIterator(const UnitListNode *start):pos(start) {
       GetNextValidUnit();
     }
-    ConstIterator& ConstIterator::operator=( const ConstIterator& orig ) {
+    ConstIterator& operator=( const ConstIterator& orig ) {
         pos = orig.pos;
         return *this;
     }
--- ./src/cmd/weapon_xml.h~     2006-03-21 19:18:36.000000000 +0000
+++ ./src/cmd/weapon_xml.h      2006-03-21 19:18:44.000000000 +0000
@@ -32,7 +32,7 @@
   void Type (enum WEAPON_TYPE typ) {type=typ;switch(typ) {case 
BOLT:file=string("");break;case BEAM:file=string("beamtexture.bmp");break;case 
BALL:file=string("ball.ani");break;case 
PROJECTILE:file=string("missile.bfxm");break;default:break;}} 
   void MntSize(enum MOUNT_SIZE size) {this->size = size;}
   weapon_info(enum WEAPON_TYPE typ) {init();Type(typ);}
-  weapon_info::weapon_info(const weapon_info &tmp) {*this = tmp;}
+  weapon_info(const weapon_info &tmp) {*this = tmp;}
   //  weapon_info& operator = (const weapon_info &tmp);
   void netswap();
 };
--- ./src/cmd/base.h~   2006-03-21 19:24:47.000000000 +0000
+++ ./src/cmd/base.h    2006-03-21 19:25:08.000000000 +0000
@@ -197,10 +197,10 @@
        void GotoLink(int linknum);
        void InitCallbacks ();
        void CallCommonLinks (std::string name, std::string value);
-//     static void BaseInterface::beginElement(void *userData, const XML_Char 
*names, const XML_Char **atts);
-//     void BaseInterface::beginElement(const string &name, const 
AttributeList attributes);
-//     static void BaseInterface::endElement(void *userData, const XML_Char 
*name);
-       void BaseInterface::Load(const char * filename, const char * 
time_of_day, const char * faction);
+//     static void beginElement(void *userData, const XML_Char *names, const 
XML_Char **atts);
+//     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);
        static void ClickWin (int x, int y, int button, int state);
        void Click (int x, int y, int button, int state);
        static void PassiveMouseOverWin (int x, int y);
--- ./src/cmd/nebula_generic.h~ 2006-03-21 19:26:57.000000000 +0000
+++ ./src/cmd/nebula_generic.h  2006-03-21 19:27:04.000000000 +0000
@@ -4,7 +4,7 @@
 
 class Nebula: public Unit {
 protected:
-       static void Nebula::beginElement (void * Userdata,const XML_Char * 
name, const XML_Char ** atts);
+       static void beginElement (void * Userdata,const XML_Char * name, const 
XML_Char ** atts);
        Vector color;
        float Density;
        float fognear;
--- ./src/gfx/nav/navpath.h~    2006-03-21 19:22:56.000000000 +0000
+++ ./src/gfx/nav/navpath.h     2006-03-21 19:23:03.000000000 +0000
@@ -83,7 +83,7 @@
   void addNewPath();
   bool update();
 
-  bool NavPath::isNeighborPath(unsigned system, unsigned neighbor);
+  bool isNeighborPath(unsigned system, unsigned neighbor);
 
   NavPath();
   ~NavPath();
--- ./src/gfx/vsimage.h~        2006-03-21 19:22:16.000000000 +0000
+++ ./src/gfx/vsimage.h 2006-03-21 19:22:28.000000000 +0000
@@ -121,10 +121,10 @@
                //const static int SIZEOF_RGBQUAD;
         LOCALCONST_DECL(int,SIZEOF_RGBQUAD,sizeof(BYTE)*4)
 
-               VSImage::VSImage();
+               VSImage();
                // f2 is needed for bmp loading
-               VSImage::VSImage( VSFile * f, textureTransform * t=NULL, bool 
strip=false, VSFile * f2 = NULL);
-               VSImage::~VSImage();
+               VSImage( VSFile * f, textureTransform * t=NULL, bool 
strip=false, VSFile * f2 = NULL);
+               ~VSImage();
 
                // f2 is needed for bmp loading
                unsigned char*  ReadImage( VSFile * f, textureTransform * 
t=NULL, bool strip=false, VSFile * f2 = NULL);
--- ./src/star_system.h~        2006-03-21 19:22:38.000000000 +0000
+++ ./src/star_system.h 2006-03-21 19:22:47.000000000 +0000
@@ -34,7 +34,7 @@
   Texture *LightMap[6]; 
   //vector <class MissileEffect *> dischargedMissiles;
  public:
-  GameStarSystem::GameStarSystem(const char * filename, const Vector & 
centr=Vector(0,0,0),const float timeofyear=0);
+  GameStarSystem(const char * filename, const Vector & 
centr=Vector(0,0,0),const float timeofyear=0);
   ~GameStarSystem();
   //void UpdateUnitPhysics(bool firstframe);
   //class CollideTable *collidetable;

-- 
Martin Michlmayr
http://www.cyrius.com/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to