Changeset 10544 for code/branches/core7/src/libraries/core

Timestamp:

Jun 7, 2015, 3:24:55 PM (10 years ago)

Author:

landauf

Message:

fixed tests

Location:

code/branches/core7/src/libraries/core

Files:

• Core.cc (modified) (1 diff)
• object/Context.cc (modified) (1 diff)
• object/Context.h (modified) (1 diff)

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

@@ -255 +255 @@
         if (this->staticInitHandler_)
             StaticInitializationManager::getInstance().removeHandler(this->staticInitHandler_);
-        delete Context::getRootContext();
-        Context::setRootContext(NULL);
+        Context::destroyRootContext();
         safeObjectDelete(&rootModule_);
         safeObjectDelete(&staticInitHandler_);

code/branches/core7/src/libraries/core/object/Context.cc

@@ -79 +79 @@
     }
 
+    /*static*/ void Context::destroyRootContext()
+    {
+        delete Context::rootContext_s;
+        Context::rootContext_s = NULL;
+    }
+
     /*static*/ Context* Context::getRootContext()
     {

code/branches/core7/src/libraries/core/object/Context.h

@@ -47 +47 @@
         public:
             static void setRootContext(Context* context);
+            static void destroyRootContext();
             static Context* getRootContext();