[Orxonox-commit 845] r3359 - branches/resource/src/core

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-07-27 23:18:17 +0200 (Mon, 27 Jul 2009)
New Revision: 3359

Modified:
   branches/resource/src/core/Game.cc
   branches/resource/src/core/Identifier.h
   branches/resource/src/core/LuaBind.h
   branches/resource/src/core/TclThreadManager.h
Log:
- Stupid MSVC extension: map::erase delivers an iterator but it shouldn't.
- And fixed another bug in orxonox_cast.
- Added two missing includes.

Modified: branches/resource/src/core/Game.cc
===================================================================
--- branches/resource/src/core/Game.cc	2009-07-27 12:42:37 UTC (rev 3358)
+++ branches/resource/src/core/Game.cc	2009-07-27 21:18:17 UTC (rev 3359)
@@ -553,7 +553,7 @@
                 if (it->second->getInfo().bGraphicsMode)
                 {
                     delete it->second;
-                    it = constructedStates_.erase(it);
+                    constructedStates_.erase(it++);
                 }
                 else
                     ++it;

Modified: branches/resource/src/core/Identifier.h
===================================================================
--- branches/resource/src/core/Identifier.h	2009-07-27 12:42:37 UTC (rev 3358)
+++ branches/resource/src/core/Identifier.h	2009-07-27 21:18:17 UTC (rev 3359)
@@ -501,7 +501,10 @@
         FORCEINLINE static T* cast(U* source)
         {
 #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);
 #endif

Modified: branches/resource/src/core/LuaBind.h
===================================================================
--- branches/resource/src/core/LuaBind.h	2009-07-27 12:42:37 UTC (rev 3358)
+++ branches/resource/src/core/LuaBind.h	2009-07-27 21:18:17 UTC (rev 3359)
@@ -39,6 +39,7 @@
 
 #include <cassert>
 #include <string>
+#include <vector>
 extern "C" {
 #include <lua.h>
 }

Modified: branches/resource/src/core/TclThreadManager.h
===================================================================
--- branches/resource/src/core/TclThreadManager.h	2009-07-27 12:42:37 UTC (rev 3358)
+++ branches/resource/src/core/TclThreadManager.h	2009-07-27 21:18:17 UTC (rev 3359)
@@ -32,6 +32,7 @@
 #include "CorePrereqs.h"
 
 #include <cassert>
+#include <list>
 #include <map>
 #include <string>