[Orxonox-commit 2475] r7182 - in code/trunk/src: libraries/util orxonox/gametypes

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-08-18 19:41:10 +0200 (Wed, 18 Aug 2010)
New Revision: 7182

Modified:
   code/trunk/src/libraries/util/Serialise.h
   code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc
Log:
Build fixes for Visual Studio 2005.

Modified: code/trunk/src/libraries/util/Serialise.h
===================================================================
--- code/trunk/src/libraries/util/Serialise.h	2010-08-18 14:01:38 UTC (rev 7181)
+++ code/trunk/src/libraries/util/Serialise.h	2010-08-18 17:41:10 UTC (rev 7182)
@@ -683,23 +683,23 @@
             saveAndIncrease( *it, mem );
     }
 
-    template <class T> inline void loadAndIncrease( const std::set<T>& variable, uint8_t*& mem )
+    template <class T> inline void loadAndIncrease(std::set<T>& variable, uint8_t*& mem )
     {
         uint32_t nrOfElements = 0;
         loadAndIncrease( nrOfElements, mem );
-        typename std::set<T>::const_iterator it = variable.begin();
+        typename std::set<T>::iterator it = variable.begin();
         for( uint32_t i = 0; i<nrOfElements; ++i )
         {
             T temp;
             loadAndIncrease(temp, mem);
             while( it!=variable.end() && *it!=temp )
             {
-                ((std::set<T>*)(&variable))->erase(it++);
+                variable.erase(it++);
                 ++it;
             }
             if( it==variable.end() )
             {
-                ((std::set<T>*)(&variable))->insert(temp);
+                variable.insert(temp);
             }
         }
     }

Modified: code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc
===================================================================
--- code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc	2010-08-18 14:01:38 UTC (rev 7181)
+++ code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc	2010-08-18 17:41:10 UTC (rev 7182)
@@ -154,7 +154,7 @@
             }
 
             // Remove all inactive SpawnPoints from the list.
-            for (std::set<SpawnPoint*>::const_iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); )
+            for (std::set<SpawnPoint*>::iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); )
             {
                 if(!(*it)->isActive())
                 {