Index: src/libchcore/TTaskInfo.h =================================================================== diff -u -N -rfc67a825635691930b3ac00dc95b16e59f3d2fae -ra44714d5c7ec0f50a376f4d0ea919ee5a224f834 --- src/libchcore/TTaskInfo.h (.../TTaskInfo.h) (revision fc67a825635691930b3ac00dc95b16e59f3d2fae) +++ src/libchcore/TTaskInfo.h (.../TTaskInfo.h) (revision a44714d5c7ec0f50a376f4d0ea919ee5a224f834) @@ -49,9 +49,9 @@ public: TTaskInfoEntry(); - TTaskInfoEntry(taskid_t tTaskID, const TSmartPath& pathTask, int iOrder, const TTaskPtr& spTask); + TTaskInfoEntry(object_id_t oidTaskID, const TSmartPath& pathTask, int iOrder, const TTaskPtr& spTask); - size_t GetObjectID() const; + object_id_t GetObjectID() const; TSmartPath GetTaskSerializeLocation() const; void SetTaskSerializeLocation(const TSmartPath& pathTask); @@ -71,7 +71,7 @@ private: #pragma warning(push) #pragma warning(disable:4251) - size_t m_stObjectID; + object_id_t m_oidObjectID; typedef std::bitset Bitset; mutable std::bitset m_setModifications; TSharedModificationTracker m_pathSerializeLocation; @@ -92,7 +92,7 @@ TTaskInfoEntry& GetAt(size_t stIndex); const TTaskInfoEntry& GetAt(size_t stIndex) const; - TTaskInfoEntry& GetAtOid(size_t stObjectID); + TTaskInfoEntry& GetAtOid(object_id_t oidObjectID); bool GetByTaskID(taskid_t tTaskID, TTaskInfoEntry& rInfo) const; @@ -115,7 +115,7 @@ std::vector m_vTaskInfos; mutable TRemovedObjects m_setRemovedTasks; #pragma warning(pop) - size_t m_stLastObjectID; + object_id_t m_oidLastObjectID; }; END_CHCORE_NAMESPACE