Changeset 3366 for code/branches/resource/src/core/LuaBind.cc

Timestamp:

Jul 29, 2009, 10:27:10 PM (15 years ago)

Author:

rgrieder

Message:

Derived all singletons implemented in a usual manner from orxonox::Singleton<T>.
This resolves inconsistencies with the singletonPtr_s variable in case of exceptions (asserts were being triggered then).
And while at it replaced singletonRef_s with singletonPtr_s for it to be less misleading (as fabian has already pointed out).

File:

• code/branches/resource/src/core/LuaBind.cc (modified) (2 diffs)

code/branches/resource/src/core/LuaBind.cc

@@ -43 +43 @@
 namespace orxonox
 {
-  LuaBind* LuaBind::singletonRef_s = NULL;
+  LuaBind* LuaBind::singletonPtr_s = NULL;
 
   LuaBind::LuaBind()
   {
-    assert(LuaBind::singletonRef_s == 0);
-    LuaBind::singletonRef_s = this;
-
     this->includePath_ = Core::getMediaPathString();
 
@@ -75 +72 @@
   {
     this->closeToluaInterfaces(luaState_);
-
-    assert(singletonRef_s);
-    LuaBind::singletonRef_s = NULL;
   };