diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/being.h | 3 | ||||
| -rw-r--r-- | src/game.h | 2 | ||||
| -rw-r--r-- | src/gui/trade.h | 2 |
4 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2008-01-26 Bjørn Lindeijer <bjorn@lindeijer.nl> + + * src/gui/trade.h, src/game.h, src/being.h: Fixed a GCC 4.3 compile + error and constified the usage of auto_ptr, since that's the way in + which we are using them. + 2008-01-19 Philipp Sehmisch <tmw@crushnet.org> * data/maps/new_10-1.tmx, data/maps/new_11-1.tmx: Map fixes by 5t3v3 at diff --git a/src/being.h b/src/being.h index bdcabbdf..62ad7ed1 100644 --- a/src/being.h +++ b/src/being.h @@ -25,6 +25,7 @@ #define _TMW_BEING_H #include <list> +#include <memory> #include <string> #include <SDL_types.h> #include <vector> @@ -355,7 +356,7 @@ class Being : public Sprite */ void controlParticle(Particle *particle); - std::auto_ptr<Equipment> mEquipment; + const std::auto_ptr<Equipment> mEquipment; protected: /** @@ -60,7 +60,7 @@ class Game : public ConfigListener /** The minimum frame time (used for frame limiting). */ int mMinFrameTime; - typedef std::auto_ptr<MessageHandler> MessageHandlerPtr; + typedef const std::auto_ptr<MessageHandler> MessageHandlerPtr; MessageHandlerPtr mBeingHandler; MessageHandlerPtr mBuySellHandler; MessageHandlerPtr mChatHandler; diff --git a/src/gui/trade.h b/src/gui/trade.h index cf792c19..49deb899 100644 --- a/src/gui/trade.h +++ b/src/gui/trade.h @@ -117,7 +117,7 @@ class TradeWindow : public Window, gcn::ActionListener, SelectionListener private: Network *mNetwork; - typedef std::auto_ptr<Inventory> InventoryPtr; + typedef const std::auto_ptr<Inventory> InventoryPtr; InventoryPtr mMyInventory; InventoryPtr mPartnerInventory; |