Index: src/libchcore/TTaskInfo.h =================================================================== diff -u -ra4635addad389b9e117679437a3e1b64a739ea96 -re98c03b108baad889dfd7c7fbb1a49f5ea5a55d8 --- src/libchcore/TTaskInfo.h (.../TTaskInfo.h) (revision a4635addad389b9e117679437a3e1b64a739ea96) +++ src/libchcore/TTaskInfo.h (.../TTaskInfo.h) (revision e98c03b108baad889dfd7c7fbb1a49f5ea5a55d8) @@ -19,7 +19,6 @@ #ifndef __TTASKINFO_H__ #define __TTASKINFO_H__ -#include "libchcore.h" #include "TPath.h" #include "TaskID.h" #include "ISerializerContainer.h" @@ -41,13 +40,14 @@ eMod_Added, eMod_TaskPath, eMod_Order, + eMod_LogPath, eMod_Last }; public: TTaskInfoEntry(); - TTaskInfoEntry(object_id_t oidTaskID, const TSmartPath& pathTask, int iOrder, const TTaskPtr& spTask); + TTaskInfoEntry(object_id_t oidTaskID, const TSmartPath& pathTask, const TSmartPath& pathLog, int iOrder, const TTaskPtr& spTask); TTaskInfoEntry(const TTaskInfoEntry& rSrc); TTaskInfoEntry& operator=(const TTaskInfoEntry& rSrc); @@ -57,6 +57,9 @@ TSmartPath GetTaskSerializeLocation() const; void SetTaskSerializeLocation(const TSmartPath& pathTask); + TSmartPath GetTaskLogPath() const; + void SetTaskLogPath(const TSmartPath& pathLog); + TTaskPtr GetTask() const; void SetTask(const TTaskPtr& spTask); @@ -76,6 +79,7 @@ typedef std::bitset Bitset; mutable std::bitset m_setModifications; TSharedModificationTracker m_pathSerializeLocation; + TSharedModificationTracker m_pathLogPath; TSharedModificationTracker m_iOrder; TTaskPtr m_spTask; @@ -86,8 +90,11 @@ { public: TTaskInfoContainer(); + TTaskInfoContainer(const TTaskInfoContainer&) = delete; - void Add(const TSmartPath& strPath, int iOrder, const TTaskPtr& spTask); + TTaskInfoContainer& operator=(const TTaskInfoContainer&) = delete; + + void Add(const TSmartPath& strPath, const TSmartPath& pathLog, int iOrder, const TTaskPtr& spTask); void RemoveAt(size_t stIndex); TTaskInfoEntry& GetAt(size_t stIndex);