Changeset 5867 for code/branches/core5/src/libraries/core

Timestamp:

Oct 4, 2009, 12:02:28 AM (15 years ago)

Author:

rgrieder

Message:

Modified Scoped Singleton concept: Derive from Singleton normally, but place an important pre-main() instruction in the source file: ManageScopedSingleton(className, scope) (it's a macro).
This causes the Singleton to be created and destroyed with the Scope. Thus if a Singleton c'tor throws, it is much easier to react accordingly.

Location:

code/branches/core5/src/libraries/core

Files:

• CMakeLists.txt (modified) (1 diff)
• Core.cc (modified) (3 diffs)
• ScopedSingletonManager.cc (added)
• ScopedSingletonManager.h (added)

code/branches/core5/src/libraries/core/CMakeLists.txt

@@ -37 +37 @@
   PathConfig.cc
   Resource.cc
+  ScopedSingletonManager.cc
   WindowEventListener.cc
 

code/branches/core5/src/libraries/core/Core.cc

@@ -65 +65 @@
 #include "Language.h"
 #include "LuaState.h"
+#include "ScopedSingletonManager.h"
 #include "Shell.h"
 #include "TclBind.h"
@@ -433 +434 @@
     {
         // singletons from other libraries
-        Scope<ScopeID::Root>::update(time);
+        ScopedSingletonManager::update(time, ScopeID::Root);
         if (this->bGraphicsLoaded_)
         {
@@ -441 +442 @@
             this->guiManager_->update(time);
             // graphics singletons from other libraries
-            Scope<ScopeID::Graphics>::update(time);
+            ScopedSingletonManager::update(time, ScopeID::Graphics);
         }
         // process thread commands