Changeset 1792 for code/trunk/src/core/TclBind.cc

Timestamp:

Sep 16, 2008, 8:45:13 PM (17 years ago)

Author:

rgrieder

Message:

Changed initialisation of TclThreadManager, TclBind and Shell to match the simple singleton concept (runtime assert in the c'tor).
That simplifies things a lot. The instances now 'belong' to GSRoot.

File:

• code/trunk/src/core/TclBind.cc (modified) (3 diffs)

code/trunk/src/core/TclBind.cc

@@ -27 +27 @@
  */
 
+#include "TclBind.h"
+
 #include <iostream>
 #include <string>
-
 #include "ConsoleCommand.h"
 #include "CommandExecutor.h"
 #include "TclThreadManager.h"
-#include "TclBind.h"
 #include "util/Debug.h"
 #include "util/String.h"
@@ -42 +42 @@
     SetConsoleCommandShortcut(TclBind, bgerror);
 
-    TclBind::TclBind()
+    TclBind* TclBind::singletonRef_s = 0;
+
+    TclBind::TclBind(const std::string& datapath)
     {
+        assert(singletonRef_s == 0);
+        singletonRef_s = this;
         this->interpreter_ = 0;
         this->bSetTclLibPath_ = false;
+        this->setDataPath(datapath);
     }
 
@@ -52 +57 @@
         if (this->interpreter_)
             delete this->interpreter_;
-    }
-
-    TclBind& TclBind::getInstance()
-    {
-        static TclBind instance;
-        return instance;
+        singletonRef_s = 0;
     }