Changeset 3359

Timestamp:

Jul 27, 2009, 11:18:17 PM (15 years ago)

Author:

rgrieder

Message:

• Stupid MSVC extension: map::erase delivers an iterator but it shouldn't.
• And fixed another bug in orxonox_cast.
• Added two missing includes.

Location:

code/branches/resource/src/core

Files:

• Game.cc (modified) (1 diff)
• Identifier.h (modified) (1 diff)
• LuaBind.h (modified) (1 diff)
• TclThreadManager.h (modified) (1 diff)

code/branches/resource/src/core/Game.cc

@@ -554 +554 @@
                 {
                     delete it->second;
-                    it = constructedStates_.erase(it);
+                    constructedStates_.erase(it++);
                 }
                 else

code/branches/resource/src/core/Identifier.h

@@ -502 +502 @@
         {
 #ifdef ORXONOX_COMPILER_MSVC
-            return source->template getDerivedPointer<T>(ClassIdentifier<T>::getIdentifier()->getClassID());
+            if (source != NULL)
+                return source->template getDerivedPointer<T>(ClassIdentifier<T>::getIdentifier()->getClassID());
+            else
+                return NULL;
 #else
             return dynamic_cast<T*>(source);

code/branches/resource/src/core/LuaBind.h

@@ -40 +40 @@
 #include <cassert>
 #include <string>
+#include <vector>
 extern "C" {
 #include <lua.h>

code/branches/resource/src/core/TclThreadManager.h

@@ -33 +33 @@
 
 #include <cassert>
+#include <list>
 #include <map>
 #include <string>