Merged revisions 3692 via svnmerge from

https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk

........
  r3692 | gmelquio | 2007-10-27 11:03:13 +0200 (Sat, 27 Oct 2007) | 1 line
  
  Made it compile with GCC 4.3
........

7 files changed, 16 insertions, 6 deletions

diff --git a/src/resources/buddylist.cpp b/src/resources/buddylist.cpp
index 9327ef60..2f85825a 100644
--- a/src/resources/buddylist.cpp
+++ b/src/resources/buddylist.cpp
@@ -21,11 +21,15 @@
  *  $Id$
  */
 
+#include <algorithm>
+#include <cstring>
+#include <iostream>
+#include <fstream>
+
 #include "buddylist.h"
+
 #include "../main.h"
 #include "../configuration.h"
-#include <iostream>
-#include <fstream>
 
 BuddyList::BuddyList()
 {
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index 565e8860..08a6a110 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -21,6 +21,8 @@
  *  $Id$
  */
 
+#include <algorithm>
+
 #include "imageset.h"
 
 #include "../log.h"
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index fb95a521..9d64534c 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -21,12 +21,12 @@
  *  $Id$
  */
 
+#include <algorithm>
 #include <cassert>
+#include <libxml/tree.h>
 
 #include "itemdb.h"
 
-#include <libxml/tree.h>
-
 #include "iteminfo.h"
 #include "resourcemanager.h"
 
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index b6fc922c..2726a012 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -107,7 +107,7 @@ class ItemInfo
 
         void setWeaponType(int);
 
-        const SpriteAction getAttackType() const
+        SpriteAction getAttackType() const
         { return mAttackType; }
 
         void addSound(EquipmentSoundEvent event, const std::string &filename);
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 7bdafdc2..84e3a219 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -21,6 +21,8 @@
  *  $Id$
  */
 
+#include <algorithm>
+
 #include "monsterdb.h"
 
 #include "resourcemanager.h"
diff --git a/src/resources/monsterinfo.cpp b/src/resources/monsterinfo.cpp
index 9b841058..c4c9ce10 100644
--- a/src/resources/monsterinfo.cpp
+++ b/src/resources/monsterinfo.cpp
@@ -21,6 +21,8 @@
  *  $Id: monsterinfo.cpp 2650 2006-09-03 15:00:47Z b_lindeijer $
  */
 
+#include <algorithm>
+
 #include "monsterinfo.h"
 
 #include "../utils/dtor.h"
diff --git a/src/resources/monsterinfo.h b/src/resources/monsterinfo.h
index 7613fee2..7d49db1a 100644
--- a/src/resources/monsterinfo.h
+++ b/src/resources/monsterinfo.h
@@ -77,7 +77,7 @@ class MonsterInfo
         const std::string&
         getSprite() const { return mSprite; }
 
-        const Being::TargetCursorSize
+        Being::TargetCursorSize
         getTargetCursorSize() const { return mTargetCursorSize; }
 
         std::string