Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3359 for code


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed

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

    r3358 r3359  
    554554                {
    555555                    delete it->second;
    556                     it = constructedStates_.erase(it);
     556                    constructedStates_.erase(it++);
    557557                }
    558558                else

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

    r3325 r3359  
    502502        {
    503503#ifdef ORXONOX_COMPILER_MSVC
    504             return source->template getDerivedPointer<T>(ClassIdentifier<T>::getIdentifier()->getClassID());
     504            if (source != NULL)
     505                return source->template getDerivedPointer<T>(ClassIdentifier<T>::getIdentifier()->getClassID());
     506            else
     507                return NULL;
    505508#else
    506509            return dynamic_cast<T*>(source);

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

    r3340 r3359  
    4040#include <cassert>
    4141#include <string>
     42#include <vector>
    4243extern "C" {
    4344#include <lua.h>

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

    r3321 r3359  
    3333
    3434#include <cassert>
     35#include <list>
    3536#include <map>
    3637#include <string>
Note: See TracChangeset for help on using the changeset viewer.