Index: src/libchcore/TTask.h =================================================================== diff -u -rfb881f503caba7b2ade610ba7fc1a36a5aea5d01 -rd18db617f4727a237c94b59af9b4328f829eda16 --- src/libchcore/TTask.h (.../TTask.h) (revision fb881f503caba7b2ade610ba7fc1a36a5aea5d01) +++ src/libchcore/TTask.h (.../TTask.h) (revision d18db617f4727a237c94b59af9b4328f829eda16) @@ -32,7 +32,6 @@ #include "TTaskStatsSnapshot.h" #include "ISerializer.h" #include "TTaskBaseData.h" -#include "TEvent.h" #include #include "log.h" #include "IFilesystem.h" @@ -89,7 +88,7 @@ void SetTaskDefinition(const TTaskDefinition& rTaskDefinition); void SetLogPath(const TSmartPath& pathLog); - chcore::log_file& GetLog(); + log_file& GetLog(); // methods are called when task is being added or removed from the global task array /// Method is called when this task is being added to a TTaskManager object @@ -110,10 +109,6 @@ TSubTaskBase::ESubOperationResult CheckForWaitState(); - // m_nStatus - void SetStatusNL(UINT nStatus, UINT nMask); - UINT GetStatusNL(UINT nMask = 0xffffffff); - void SetForceFlagNL(bool bFlag = true); bool GetForceFlagNL(); @@ -167,7 +162,7 @@ bool m_bContinue; // allows task to continue // other helpers - chcore::log_file m_log; ///< Log file where task information will be stored + log_file m_log; ///< Log file where task information will be stored /// Thread controlling object TWorkerThreadController m_workerThread; @@ -187,7 +182,7 @@ friend class TTaskManager; }; - typedef boost::shared_ptr TTaskPtr; + typedef std::shared_ptr TTaskPtr; } #endif