Changeset 11280

Timestamp:

07/07/11 19:51:22 (13 years ago)

Author:

tbretz

Message:

Added virtual function for locking; fixed the order of instantiation of the base classes of StateMachineDim.

Location:

trunk/FACT++/src

Files:

• StateMachineDim.cc (modified) (2 diffs)
• StateMachineDim.h (modified) (2 diffs)

trunk/FACT++/src/StateMachineDim.cc

@@ -65 +65 @@
 //
 StateMachineDim::StateMachineDim(ostream &out, const std::string &name)
-    : StateMachine(out, name), DimLog(out, name), DimStart(name, DimLog::fLog),
+    : DimLog(out, name), DimStart(name, DimLog::fLog), StateMachineImp(out, name),
     fDescriptionStates((name+"/STATE_LIST").c_str(), const_cast<char*>(""),
                        "Provides a list with descriptions for each service."
@@ -140 +140 @@
 }
 
+void StateMachineDim::Lock()
+{
+//    dim_lock();
+}
+
+void StateMachineDim::UnLock()
+{
+//    dim_unlock();
+}
+
 // --------------------------------------------------------------------------
 //

trunk/FACT++/src/StateMachineDim.h

@@ -53 +53 @@
 #include "StateMachine.h"     // StateMachien
 
-class StateMachineDim : public DimCommandHandler, public StateMachine, public DimLog, public DimStart
+class StateMachineDim : public DimCommandHandler, public DimLog, public DimStart, public StateMachineImp
 {
 private:
@@ -76 +76 @@
     std::string SetCurrentState(int state, const char *txt="", const std::string &cmd="");
 
+    void Lock();
+    void UnLock();
+
 public:
     StateMachineDim(std::ostream &out=std::cout, const std::string &name="DEFAULT");