Index: src/libchcore/TSubTaskCopyMove.h =================================================================== diff -u -N -ra44714d5c7ec0f50a376f4d0ea919ee5a224f834 -rd76d3ce6c8c55fa23009dbb03b8bc06f482c5b72 --- src/libchcore/TSubTaskCopyMove.h (.../TSubTaskCopyMove.h) (revision a44714d5c7ec0f50a376f4d0ea919ee5a224f834) +++ src/libchcore/TSubTaskCopyMove.h (.../TSubTaskCopyMove.h) (revision d76d3ce6c8c55fa23009dbb03b8bc06f482c5b72) @@ -38,56 +38,6 @@ class TSimpleDataBuffer; class TBufferSizes; -namespace details -{ - /////////////////////////////////////////////////////////////////////////// - // TCopyMoveProgressInfo - - class TCopyMoveProgressInfo : public TSubTaskProgressInfo - { - public: - TCopyMoveProgressInfo(); - virtual ~TCopyMoveProgressInfo(); - - virtual void ResetProgress(); - - // file being processed - void SetCurrentIndex(file_count_t fcIndex); - void IncreaseCurrentIndex(); - file_count_t GetCurrentIndex() const; - - // part of file being processed - void SetCurrentFileProcessedSize(unsigned long long ullSize); - unsigned long long GetCurrentFileProcessedSize() const; - void IncreaseCurrentFileProcessedSize(unsigned long long ullSizeToAdd); - void DecreaseCurrentFileProcessedSize(unsigned long long ullSizeToSubtract); - - void Store(ISerializerRowData& rRowData) const; - static void InitColumns(IColumnsDefinition& rColumns); - void Load(const ISerializerRowReaderPtr& spRowReader); - bool WasSerialized() const; - - private: - enum EModifications - { - eMod_Added, - eMod_CurrentIndex, - eMod_CurrentFileProcessedSize, - - // last item - eMod_Last - }; - - typedef std::bitset Bitset; - mutable Bitset m_setModifications; - - TSharedModificationTracker m_fcCurrentIndex; - TSharedModificationTracker m_ullCurrentFileProcessedSize; // count of bytes processed for current file - - mutable boost::shared_mutex m_lock; - }; -} - class LIBCHCORE_API TSubTaskCopyMove : public TSubTaskBase { public: @@ -103,7 +53,6 @@ void InitColumns(const ISerializerContainerPtr& spContainer) const; - virtual TSubTaskProgressInfo& GetProgressInfo() { return m_tProgressInfo; } virtual void GetStatsSnapshot(TSubTaskStatsSnapshotPtr& rStats) const; private: @@ -131,7 +80,6 @@ private: #pragma warning(push) #pragma warning(disable: 4251) - details::TCopyMoveProgressInfo m_tProgressInfo; TSubTaskStatsInfo m_tSubTaskStats; #pragma warning(pop) };