# debatable, but it should be fairly trivial to port
tags 462566 patch
thanks
Martin Michlmayr wrote:
Package: wormux
Version: 0.8beta4-1
Severity: important
Usertags: ftbfs-gcc-4.3
Your package fails to build with GCC 4.3. Version 4.3 has not been
released yet but I'm building with a snapshot in order to find errors
and give people an advance warning.
You can reproduce this problem with gcc-4.3 or gcc-snapshot from
unstable.
Automatic build of wormux_0.8beta4-1 on em64t by sbuild/amd64 0.53
...
Execute make to compile then execute make install to install...
/usr/bin/make -C .
make[1]: Entering directory `/build/tbm/wormux-0.8beta4'
Making all in data
make[2]: Entering directory `/build/tbm/wormux-0.8beta4/data'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/build/tbm/wormux-0.8beta4/data'
Making all in src
make[2]: Entering directory `/build/tbm/wormux-0.8beta4/src'
/usr/bin/make all-recursive
make[3]: Entering directory `/build/tbm/wormux-0.8beta4/src'
Making all in .
make[4]: Entering directory `/build/tbm/wormux-0.8beta4/src'
g++ -DHAVE_CONFIG_H -I. -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I ../src
-DINSTALL_DATADIR=\"/usr/share/games/wormux\" -DINSTALL_LOCALEDIR=\"/usr/share/locale\"
-DFONT_FILE=\"/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf\" -DPACKAGE_VERSION=\"0.8beta4\"
-Werror -Wall -Wextra -O2 -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DPNG_NO_MMX_CODE -I/usr/include/libpng12
-I/usr/include/libxml++-2.6 -I/usr/include/libxml2 -I/usr/include/glibmm-2.4 -I/usr/lib/glibmm-2.4/include
-I/usr/include/sigc++-2.0 -I/usr/lib/sigc++-2.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-DPNG_NO_MMX_CODE -I/usr/include/libpng12 -c -o ai_engine.o `test -f 'ai/ai_engine.cpp' || echo './'`ai/ai_engine.cpp
cc1plus: warnings being treated as errors
In file included from ./tool/error.h:55,
from ./include/base.h:62,
from ./ai/ai_movement_module.h:24,
from ./ai/ai_engine_stupid.h:24,
from ai/ai_engine.cpp:25:
./network/network.h:80: error: type qualifiers ignored on function return type
./network/network.h:130: error: type qualifiers ignored on function return type
./network/network.h:131: error: type qualifiers ignored on function return type
./network/network.h:132: error: type qualifiers ignored on function return type
./network/network.h:133: error: type qualifiers ignored on function return type
./network/network.h:149: error: type qualifiers ignored on function return type
In file included from ./tool/point.h:28,
from ./ai/ai_movement_module.h:25,
from ./ai/ai_engine_stupid.h:24,
from ai/ai_engine.cpp:25:
./tool/vector2.h: In member function 'double Vector2<T>::ComputeAngle() const':
./tool/vector2.h:388: error: suggest explicit braces to avoid ambiguous 'else'
In file included from ./object/physical_obj.h:30,
from ./character/character.h:28,
from ai/ai_engine.cpp:26:
./object/physics.h: At global scope:
./object/physics.h:86: error: type qualifiers ignored on function return type
./object/physics.h:89: error: type qualifiers ignored on function return type
./object/physics.h:92: error: type qualifiers ignored on function return type
./object/physics.h:95: error: type qualifiers ignored on function return type
./object/physics.h:98: error: type qualifiers ignored on function return type
In file included from ./team/team.h:31,
from ai/ai_engine.cpp:28:
./weapon/weapon.h:302: error: type qualifiers ignored on function return type
make[4]: *** [ai_engine.o] Error 1
make[4]: Leaving directory `/build/tbm/wormux-0.8beta4/src'
I have just finished and committed (r4065) a patch against upstream
trunk that fixes this issue.
svn://svn.gna.org/svn/wormux/[EMAIL PROTECTED]
Now I am too tired to backport it to sid's wormux right now, but here is
patch attached for reference. I'll probably backport this by the end of
the weekend.
--
Regards,
EddyP
=============================================
"Imagination is more important than knowledge" A.Einstein
diff --git a/src/game/config.cpp b/src/game/config.cpp
index 5e40d70..93d244b 100644
--- a/src/game/config.cpp
+++ b/src/game/config.cpp
@@ -23,6 +23,7 @@
#include "game/config.h"
+#include <cstdlib>
#include <sstream>
#include <string>
#include <iostream>
diff --git a/src/game/game.cpp b/src/game/game.cpp
index f63665d..f015fdd 100644
--- a/src/game/game.cpp
+++ b/src/game/game.cpp
@@ -213,7 +213,7 @@ void Game::Init()
void Game::IgnorePendingInputEvents() const
{
SDL_Event event;
- while(SDL_PollEvent(&event));
+ while(SDL_PollEvent(&event)) { ; }
}
void Game::RefreshInput()
diff --git a/src/graphic/polygon.cpp b/src/graphic/polygon.cpp
index ca0d8b5..d6a256b 100644
--- a/src/graphic/polygon.cpp
+++ b/src/graphic/polygon.cpp
@@ -116,12 +116,12 @@ void PolygonItem::SetAlignment(H_align h_a, V_align v_a)
v_align = v_a;
}
-const Point2d & PolygonItem::GetPosition() const
+Point2d & PolygonItem::GetPosition()
{
return position;
}
-const Point2d & PolygonItem::GetTransformedPosition() const
+Point2d & PolygonItem::GetTransformedPosition()
{
return transformed_position;
}
diff --git a/src/graphic/polygon.h b/src/graphic/polygon.h
index 9d99e4e..77a6b35 100644
--- a/src/graphic/polygon.h
+++ b/src/graphic/polygon.h
@@ -54,8 +54,8 @@ class PolygonBuffer {
class PolygonItem {
/* if you need that, implement it (correctly)*/
- PolygonItem(const PolygonItem&);
- PolygonItem operator=(const PolygonItem&);
+ PolygonItem( PolygonItem&);
+ PolygonItem operator=( PolygonItem&);
/*********************************************/
public:
@@ -76,10 +76,10 @@ class PolygonItem {
virtual ~PolygonItem();
void SetPosition(const Point2d & pos);
void SetAlignment(H_align h_a = H_CENTERED, V_align v_a = V_CENTERED);
- const H_align GetHAlign() const { return h_align; }
- const V_align GetVAlign() const { return v_align; }
- const Point2d & GetPosition() const;
- const Point2d & GetTransformedPosition() const;
+ H_align GetHAlign() const { return h_align; }
+ V_align GetVAlign() const { return v_align; }
+ Point2d & GetPosition();
+ Point2d & GetTransformedPosition();
Point2i GetIntTransformedPosition() const;
virtual bool Contains(const Point2d & p) const;
void SetSprite(Sprite * sprite);
diff --git a/src/interface/mouse.cpp b/src/interface/mouse.cpp
index b203340..caf7016 100644
--- a/src/interface/mouse.cpp
+++ b/src/interface/mouse.cpp
@@ -242,7 +242,7 @@ Point2i Mouse::GetWorldPosition() const
return GetPosition() + Camera::GetInstance()->GetPosition();
}
-const MouseCursor& Mouse::GetCursor(pointer_t pointer) const
+MouseCursor& Mouse::GetCursor(pointer_t pointer) const
{
ASSERT(pointer != POINTER_STANDARD);
@@ -255,7 +255,7 @@ const MouseCursor& Mouse::GetCursor(pointer_t pointer) const
return (*cursors.find(pointer)).second;
}
-const Mouse::pointer_t Mouse::GetPointer() const
+Mouse::pointer_t Mouse::GetPointer() const
{
return current_pointer;
}
diff --git a/src/interface/mouse.h b/src/interface/mouse.h
index 7186ca7..6aa2b7a 100644
--- a/src/interface/mouse.h
+++ b/src/interface/mouse.h
@@ -72,7 +72,7 @@ private:
void ActionRightClic(bool shift = false) const;
void ActionWheelDown(bool shift = false) const;
void ActionWheelUp(bool shift = false) const;
- const MouseCursor& GetCursor(pointer_t pointer) const;
+ MouseCursor& GetCursor(pointer_t pointer) const;
protected:
friend class Singleton<Mouse>;
@@ -87,7 +87,7 @@ public:
void CenterPointer();
// Choose the pointer
- const pointer_t GetPointer() const;
+ pointer_t GetPointer() const;
pointer_t SetPointer(pointer_t pointer);
void Draw() const;
@@ -95,6 +95,6 @@ public:
void Show();
void Hide();
- const visibility_t GetVisibility() const { return visible; };
+ visibility_t GetVisibility() const { return visible; };
};
#endif
diff --git a/src/map/maps_list.h b/src/map/maps_list.h
index 8c71a44..e509946 100644
--- a/src/map/maps_list.h
+++ b/src/map/maps_list.h
@@ -104,7 +104,7 @@ public:
uint GetNbBarrel() { LoadBasicInfo(); return nb_barrel; };
uint GetNbMine() { LoadBasicInfo(); return nb_mine; };
- const Profile * const ResProfile() const { return res_profile; };
+ Profile * ResProfile() const { return res_profile; };
bool IsOpened() { LoadBasicInfo(); return is_opened; };
bool UseWater() { LoadBasicInfo(); return use_water; };
diff --git a/src/network/network.cpp b/src/network/network.cpp
index c567b4c..d775759 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -309,7 +309,7 @@ typedef int SOCKET;
# define closesocket(fd) close(fd)
#endif
-const connection_state_t Network::GetError() const
+connection_state_t Network::GetError() const
{
#ifdef WIN32
int code = WSAGetLastError();
@@ -335,7 +335,7 @@ const connection_state_t Network::GetError() const
#endif
}
-const connection_state_t Network::CheckHost(const std::string &host, int prt) const
+connection_state_t Network::CheckHost(const std::string &host, int prt) const
{
MSG_DEBUG("network", "Checking connection to %s:%i", host.c_str(), prt);
@@ -433,7 +433,7 @@ bool Network::IsConnected()
return (!GetInstance()->IsLocal() && !stop_thread);
}
-const uint Network::GetPort() const
+uint Network::GetPort() const
{
Uint16 prt;
prt = SDLNet_Read16(&ip.port);
diff --git a/src/network/network.h b/src/network/network.h
index ab0cb96..1bf1f99 100644
--- a/src/network/network.h
+++ b/src/network/network.h
@@ -78,7 +78,7 @@ private:
Network(const Network&);
const Network& operator=(const Network&);
friend class DistantComputer;
- const connection_state_t GetError() const;
+ connection_state_t GetError() const;
static bool sdlnet_initialized;
static int num_objects;
@@ -127,10 +127,10 @@ public:
static void Disconnect();
static bool IsConnected();
- virtual const bool IsLocal() const { return false ; }
- virtual const bool IsServer() const { return false ; }
- virtual const bool IsClient() const { return false ; }
- const uint GetPort() const;
+ virtual bool IsLocal() const { return false ; }
+ virtual bool IsServer() const { return false ; }
+ virtual bool IsClient() const { return false ; }
+ uint GetPort() const;
// Action handling
void SendPacket(char* packet, int size) const;
@@ -146,7 +146,7 @@ public:
static connection_state_t ServerStart(const std::string &port);
// Manage network state
- const connection_state_t CheckHost(const std::string &host, int prt) const;
+ connection_state_t CheckHost(const std::string &host, int prt) const;
void SetState(Network::network_state_t state);
Network::network_state_t GetState() const;
void SendNetworkState() const;
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index 0b77a95..eaa4926 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -94,7 +94,7 @@ void NetworkClient::HandleAction(Action* a, DistantComputer* sender)
}
//-----------------------------------------------------------------------------
-const connection_state_t
+connection_state_t
NetworkClient::ClientConnect(const std::string &host, const std::string& port)
{
Init();
diff --git a/src/network/network_client.h b/src/network/network_client.h
index 79c365b..a4cffbc 100644
--- a/src/network/network_client.h
+++ b/src/network/network_client.h
@@ -36,14 +36,14 @@ public:
~NetworkClient();
//virtual const bool IsConnected() const { return true; }
- virtual const bool IsClient() const { return true; }
+ virtual bool IsClient() const { return true; }
virtual void SendChatMessage(const std::string& txt);
std::list<DistantComputer*>::iterator CloseConnection(std::list<DistantComputer*>::iterator);
// Client specific methods
- const connection_state_t ClientConnect(const std::string &host,
+ connection_state_t ClientConnect(const std::string &host,
const std::string& port);
};
diff --git a/src/network/network_local.h b/src/network/network_local.h
index ea1b99d..0c805d8 100644
--- a/src/network/network_local.h
+++ b/src/network/network_local.h
@@ -34,8 +34,8 @@ protected:
public:
~NetworkLocal();
- virtual const bool IsConnected() const { return false; }
- virtual const bool IsLocal() const { return true; }
+ virtual bool IsConnected() const { return false; }
+ virtual bool IsLocal() const { return true; }
virtual void SendAction(Action* action);
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index 7898bde..b23e70c 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -178,12 +178,12 @@ void NetworkServer::SetMaxNumberOfPlayers(uint _max_nb_players)
}
}
-const uint NetworkServer::GetNbConnectedPlayers() const
+uint NetworkServer::GetNbConnectedPlayers() const
{
return cpu.size() + 1;
}
-const uint NetworkServer::GetNbInitializedPlayers() const
+uint NetworkServer::GetNbInitializedPlayers() const
{
uint r = 0;
@@ -197,7 +197,7 @@ const uint NetworkServer::GetNbInitializedPlayers() const
return r;
}
-const uint NetworkServer::GetNbReadyPlayers() const
+uint NetworkServer::GetNbReadyPlayers() const
{
uint r = 0;
@@ -211,7 +211,7 @@ const uint NetworkServer::GetNbReadyPlayers() const
return r;
}
-const uint NetworkServer::GetNbCheckedPlayers() const
+uint NetworkServer::GetNbCheckedPlayers() const
{
uint r = 0;
diff --git a/src/network/network_server.h b/src/network/network_server.h
index 9be6f81..5f4be61 100644
--- a/src/network/network_server.h
+++ b/src/network/network_server.h
@@ -39,7 +39,7 @@ public:
~NetworkServer();
//virtual const bool IsConnected() const { return true; }
- virtual const bool IsServer() const { return true; }
+ virtual bool IsServer() const { return true; }
virtual void SendChatMessage(const std::string& txt);
@@ -50,10 +50,10 @@ public:
void RejectIncoming();
std::list<DistantComputer*>::iterator CloseConnection(std::list<DistantComputer*>::iterator closed);
void SetMaxNumberOfPlayers(uint max_nb_players);
- const uint GetNbConnectedPlayers() const;
- const uint GetNbInitializedPlayers() const;
- const uint GetNbReadyPlayers() const;
- const uint GetNbCheckedPlayers() const;
+ uint GetNbConnectedPlayers() const;
+ uint GetNbInitializedPlayers() const;
+ uint GetNbReadyPlayers() const;
+ uint GetNbCheckedPlayers() const;
};
//-----------------------------------------------------------------------------
diff --git a/src/object/physics.h b/src/object/physics.h
index 1596a6a..4e2665a 100644
--- a/src/object/physics.h
+++ b/src/object/physics.h
@@ -83,19 +83,19 @@ public:
void SetPhysSize (double width, double height) { m_phys_width = width; m_phys_height = height ; };
void SetMass (double mass) { m_mass = mass ; };
- const double GetMass() const { return m_mass; }
+ double GetMass() const { return m_mass; }
void SetWindFactor (double wind_factor) { m_wind_factor = wind_factor; };
- const double GetWindFactor () const { return m_wind_factor; }
+ double GetWindFactor () const { return m_wind_factor; }
void SetAirResistFactor (double factor) { m_air_resist_factor = factor; };
- const double GetAirResistFactor () const{ return m_air_resist_factor; }
+ double GetAirResistFactor () const{ return m_air_resist_factor; }
void SetGravityFactor (double factor) { m_gravity_factor = factor; };
- const double GetGravityFactor () const { return m_gravity_factor; }
+ double GetGravityFactor () const { return m_gravity_factor; }
void SetRebounding (bool rebounding) { m_rebounding = rebounding; }
- const bool GetRebounding () const { return m_rebounding; }
+ bool GetRebounding () const { return m_rebounding; }
// Used to sync value across network
virtual void GetValueFromAction(Action *);
diff --git a/src/particles/particle.h b/src/particles/particle.h
index 1302557..ddab67f 100644
--- a/src/particles/particle.h
+++ b/src/particles/particle.h
@@ -85,7 +85,7 @@ class Particle : public PhysicalObj
void SetOnTop(bool b) { on_top = b; }
bool IsOnTop() const { return on_top; }
bool StillUseful() const;
- const bool CheckOnEndTurn() const { return m_check_move_on_end_turn; }
+ bool CheckOnEndTurn() const { return m_check_move_on_end_turn; }
};
class ParticleEngine
diff --git a/src/tool/vector2.h b/src/tool/vector2.h
index da03e7f..f029b5a 100644
--- a/src/tool/vector2.h
+++ b/src/tool/vector2.h
@@ -385,9 +385,10 @@ template<class T> class Vector2
if( !IsZero( x ) )
if( !IsZero( y ) ){
double angle = atan(double(y)/double(x));
- if( x < 0 )
+ if( x < 0 ){
if( y > 0 ) return angle + M_PI;
else return angle - M_PI;
+ }
return angle;
}
else
diff --git a/src/weapon/weapon.h b/src/weapon/weapon.h
index e11ceca..8bfc4ea 100644
--- a/src/weapon/weapon.h
+++ b/src/weapon/weapon.h
@@ -300,7 +300,7 @@ public:
bool LoadXml(const xmlpp::Element * weapon);
// return the strength of the weapon
- const double ReadStrength() const { return m_strength; };
+ double ReadStrength() const { return m_strength; };
// Data access
const std::string& GetName() const;
_______________________________________________
Pkg-games-devel mailing list
Pkg-games-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-devel
