Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7182 for code/trunk/src


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

Legend:

Unmodified
Added
Removed
  • code/trunk/src/libraries/util/Serialise.h

    r7163 r7182  
    684684    }
    685685
    686     template <class T> inline void loadAndIncrease( const std::set<T>& variable, uint8_t*& mem )
     686    template <class T> inline void loadAndIncrease(std::set<T>& variable, uint8_t*& mem )
    687687    {
    688688        uint32_t nrOfElements = 0;
    689689        loadAndIncrease( nrOfElements, mem );
    690         typename std::set<T>::const_iterator it = variable.begin();
     690        typename std::set<T>::iterator it = variable.begin();
    691691        for( uint32_t i = 0; i<nrOfElements; ++i )
    692692        {
     
    695695            while( it!=variable.end() && *it!=temp )
    696696            {
    697                 ((std::set<T>*)(&variable))->erase(it++);
     697                variable.erase(it++);
    698698                ++it;
    699699            }
    700700            if( it==variable.end() )
    701701            {
    702                 ((std::set<T>*)(&variable))->insert(temp);
     702                variable.insert(temp);
    703703            }
    704704        }
  • code/trunk/src/orxonox/gametypes/TeamDeathmatch.cc

    r7163 r7182  
    155155
    156156            // Remove all inactive SpawnPoints from the list.
    157             for (std::set<SpawnPoint*>::const_iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); )
     157            for (std::set<SpawnPoint*>::iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); )
    158158            {
    159159                if(!(*it)->isActive())
Note: See TracChangeset for help on using the changeset viewer.