Changeset 11280


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/FACT++/src/StateMachineDim.cc

    r11063 r11280  
    6565//
    6666StateMachineDim::StateMachineDim(ostream &out, const std::string &name)
    67     : StateMachine(out, name), DimLog(out, name), DimStart(name, DimLog::fLog),
     67    : DimLog(out, name), DimStart(name, DimLog::fLog), StateMachineImp(out, name),
    6868    fDescriptionStates((name+"/STATE_LIST").c_str(), const_cast<char*>(""),
    6969                       "Provides a list with descriptions for each service."
     
    140140}
    141141
     142void StateMachineDim::Lock()
     143{
     144//    dim_lock();
     145}
     146
     147void StateMachineDim::UnLock()
     148{
     149//    dim_unlock();
     150}
     151
    142152// --------------------------------------------------------------------------
    143153//
  • trunk/FACT++/src/StateMachineDim.h

    r11262 r11280  
    5353#include "StateMachine.h"     // StateMachien
    5454
    55 class StateMachineDim : public DimCommandHandler, public StateMachine, public DimLog, public DimStart
     55class StateMachineDim : public DimCommandHandler, public DimLog, public DimStart, public StateMachineImp
    5656{
    5757private:
     
    7676    std::string SetCurrentState(int state, const char *txt="", const std::string &cmd="");
    7777
     78    void Lock();
     79    void UnLock();
     80
    7881public:
    7982    StateMachineDim(std::ostream &out=std::cout, const std::string &name="DEFAULT");
Note: See TracChangeset for help on using the changeset viewer.