Changeset 7182 for code

Timestamp:

Aug 18, 2010, 7:41:10 PM (14 years ago)

Author:

rgrieder

Message:

Build fixes for Visual Studio 2005.

Location:

code/trunk/src

Files:

• libraries/util/Serialise.h (modified) (2 diffs)
• orxonox/gametypes/TeamDeathmatch.cc (modified) (1 diff)

code/trunk/src/libraries/util/Serialise.h

@@ -684 +684 @@
     }
 
-    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 )
         {
@@ -695 +695 @@
             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);
             }
         }

code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc

@@ -155 +155 @@
 
             // 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())