Index: src/ch/TBasicProgressInfo.h =================================================================== diff -u -N -r6e8aa26e2428e3bc71099255c5911f57bc722100 -r5fd6beaad9f1eccb664b997d151acb59961e4827 --- src/ch/TBasicProgressInfo.h (.../TBasicProgressInfo.h) (revision 6e8aa26e2428e3bc71099255c5911f57bc722100) +++ src/ch/TBasicProgressInfo.h (.../TBasicProgressInfo.h) (revision 5fd6beaad9f1eccb664b997d151acb59961e4827) @@ -23,7 +23,6 @@ #ifndef __TBASICPROGRESSINFO_H__ #define __TBASICPROGRESSINFO_H__ - /////////////////////////////////////////////////////////////////////////// // TTaskBasicProgressInfo @@ -45,43 +44,12 @@ size_t GetSubOperationIndex() const; void IncreaseSubOperationIndex(); - template - void load(Archive& ar, unsigned int /*uiVersion*/) - { - size_t stCurrentIndex = 0; - ar >> stCurrentIndex; + void Serialize(chcore::TReadBinarySerializer& rSerializer); + void Serialize(chcore::TWriteBinarySerializer& rSerializer) const; - unsigned long long ullCurrentFileProcessedSize = 0; - ar >> ullCurrentFileProcessedSize; +private: + TTaskBasicProgressInfo(const TTaskBasicProgressInfo& rSrc); - size_t stSubOperationIndex = 0; - ar >> stSubOperationIndex; - - boost::unique_lock lock(m_lock); - - m_stCurrentIndex = stCurrentIndex; - m_ullCurrentFileProcessedSize = ullCurrentFileProcessedSize; - m_stSubOperationIndex = stSubOperationIndex; - } - - template - void save(Archive& ar, unsigned int /*uiVersion*/) const - { - m_lock.lock_shared(); - - size_t stCurrentIndex = m_stCurrentIndex; - unsigned long long ullCurrentFileProcessedSize = m_ullCurrentFileProcessedSize; - size_t stSubOperationIndex = m_stSubOperationIndex; - - m_lock.unlock_shared(); - - ar << stCurrentIndex; - ar << ullCurrentFileProcessedSize; - ar << stSubOperationIndex; - } - - BOOST_SERIALIZATION_SPLIT_MEMBER(); - private: volatile size_t m_stSubOperationIndex; // index of sub-operation from TOperationDescription volatile size_t m_stCurrentIndex; // index to the m_files array stating currently processed item