Change ClockObject to a regular pointer, to avoid static init issues

This commit is contained in:
rdb 2012-10-25 08:54:49 +00:00
parent 793665d2a6
commit de2d36f073
2 changed files with 3 additions and 2 deletions

View File

@ -22,7 +22,7 @@ void (*ClockObject::_start_clock_wait)() = ClockObject::dummy_clock_wait;
void (*ClockObject::_start_clock_busy_wait)() = ClockObject::dummy_clock_wait;
void (*ClockObject::_stop_clock_wait)() = ClockObject::dummy_clock_wait;
PT(ClockObject) ClockObject::_global_clock;
ClockObject *ClockObject::_global_clock;
TypeHandle ClockObject::_type_handle;
////////////////////////////////////////////////////////////////////
@ -595,6 +595,7 @@ make_global_clock() {
_global_clock = new ClockObject;
_global_clock->set_mode(clock_mode);
_global_clock->ref();
}
////////////////////////////////////////////////////////////////////

View File

@ -166,7 +166,7 @@ private:
typedef CycleDataWriter<CData> CDWriter;
typedef CycleDataStageReader<CData> CDStageReader;
static PT(ClockObject) _global_clock;
static ClockObject *_global_clock;
public:
static TypeHandle get_class_type() {