Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jul 29, 2009, 11:47:22 PM (15 years ago)
Author:
rgrieder
Message:

Build fixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/resource/src/util/Singleton.h

    r3366 r3367  
    3131
    3232#include "UtilPrereqs.h"
     33#include <cassert>
    3334
    3435namespace orxonox
     
    5051        static T& getInstance()
    5152        {
    52             assert(T::singletonPtr_s != NULL);
     53            assert(T::singletonPtr_s != 0);
    5354            return *T::singletonPtr_s;
    5455        }
     
    5859        Singleton()
    5960        {
    60             assert(T::singletonPtr_s == NULL);
     61            assert(T::singletonPtr_s == 0);
    6162            T::singletonPtr_s = static_cast<T*>(this);
    6263        }
     
    6566        ~Singleton()
    6667        {
    67             assert(T::singletonPtr_s != NULL);
    68             T::singletonPtr_s = NULL;
     68            assert(T::singletonPtr_s != 0);
     69            T::singletonPtr_s = 0;
    6970        }
    7071
Note: See TracChangeset for help on using the changeset viewer.