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.

3 files changed, 4 insertions, 3 deletions

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:
         /**
diff --git a/src/game.h b/src/game.h
index 2aaabf96..5b73832e 100644
--- a/src/game.h
+++ b/src/game.h
@@ -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;