Changeset 2363 for code/branches/objecthierarchy2/src/core

Timestamp:

Dec 9, 2008, 9:26:54 AM (16 years ago)

Author:

rgrieder

Message:

There is no this pointer with static variables. It's more of a C++ "feature".

Location:

code/branches/objecthierarchy2/src/core

Files:

• Core.cc (modified) (2 diffs)
• Core.h (modified) (1 diff)

code/branches/objecthierarchy2/src/core/Core.cc

@@ -56 +56 @@
         RegisterRootObject(Core);
 
-        assert(this->singletonRef_s == 0);
-        this->singletonRef_s = this;
+        assert(Core::singletonRef_s == 0);
+        Core::singletonRef_s = this;
         this->bInitializeRandomNumberGenerator_ = false;
 
@@ -68 +68 @@
     Core::~Core()
     {
-        assert(singletonRef_s);
-        singletonRef_s = 0;
+        assert(Core::singletonRef_s);
+        Core::singletonRef_s = 0;
     }
 

code/branches/objecthierarchy2/src/core/Core.h

@@ -56 +56 @@
             void languageChanged();
 
-            static Core& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
+            static Core& getInstance() { assert(Core::singletonRef_s); return *Core::singletonRef_s; }
 
             static int   getSoftDebugLevel(OutputHandler::OutputDevice device = OutputHandler::LD_All);