Index: src/libchcore/TSubTaskArray.h
===================================================================
diff -u -N -r7972b0944e0a947144fbdb93262f7d73ac528dc7 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TSubTaskArray.h	(.../TSubTaskArray.h)	(revision 7972b0944e0a947144fbdb93262f7d73ac528dc7)
+++ src/libchcore/TSubTaskArray.h	(.../TSubTaskArray.h)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -32,74 +32,73 @@
 #include <bitset>
 #include <atomic>
 
-BEGIN_CHCORE_NAMESPACE
-
-class TOperationPlan;
-class TSubTaskContext;
-
-///////////////////////////////////////////////////////////////////////////
-// TTaskBasicProgressInfo
-class LIBCHCORE_API TSubTasksArray
+namespace chcore
 {
-public:
-	TSubTasksArray(TSubTaskContext& rSubTaskContext);
-	TSubTasksArray(const TOperationPlan& rOperationPlan, TSubTaskContext& rSubTaskContext);
-	~TSubTasksArray();
+	class TOperationPlan;
+	class TSubTaskContext;
 
-	void Init(const TOperationPlan& rOperationPlan);
-	EOperationType GetOperationType() const;
+	///////////////////////////////////////////////////////////////////////////
+	// TTaskBasicProgressInfo
+	class LIBCHCORE_API TSubTasksArray
+	{
+	public:
+		TSubTasksArray(TSubTaskContext& rSubTaskContext);
+		TSubTasksArray(const TOperationPlan& rOperationPlan, TSubTaskContext& rSubTaskContext);
+		~TSubTasksArray();
 
-	// Stats handling
-	void GetStatsSnapshot(TSubTaskArrayStatsSnapshot& rSnapshot) const;
-	void ResetProgressAndStats();
+		void Init(const TOperationPlan& rOperationPlan);
+		EOperationType GetOperationType() const;
 
-	// progress handling
-	void Store(const ISerializerPtr& spSerializer) const;
-	void Load(const ISerializerPtr& spSerializer);
+		// Stats handling
+		void GetStatsSnapshot(TSubTaskArrayStatsSnapshot& rSnapshot) const;
+		void ResetProgressAndStats();
 
-	TSubTaskBase::ESubOperationResult Execute(const IFeedbackHandlerPtr& spFeedbackHandler, bool bRunOnlyEstimationSubTasks);
+		// progress handling
+		void Store(const ISerializerPtr& spSerializer) const;
+		void Load(const ISerializerPtr& spSerializer);
 
-private:
-	TSubTasksArray(const TSubTasksArray& rSrc);
-	TSubTasksArray& operator=(const TSubTasksArray& rSrc);
+		TSubTaskBase::ESubOperationResult Execute(const IFeedbackHandlerPtr& spFeedbackHandler, bool bRunOnlyEstimationSubTasks);
 
-	void AddSubTask(const TSubTaskBasePtr& spOperation, bool bIsPartOfEstimation);
-	static TSubTaskBasePtr CreateSubtask(ESubOperationType eType, TSubTaskContext& rContext);
+	private:
+		TSubTasksArray(const TSubTasksArray& rSrc);
+		TSubTasksArray& operator=(const TSubTasksArray& rSrc);
 
-	IColumnsDefinition& InitSubtasksColumns(const ISerializerContainerPtr& spContainer) const;
-	IColumnsDefinition& InitSubtasksInfoColumns(const ISerializerContainerPtr& spContainer) const;
+		void AddSubTask(const TSubTaskBasePtr& spOperation, bool bIsPartOfEstimation);
+		static TSubTaskBasePtr CreateSubtask(ESubOperationType eType, TSubTaskContext& rContext);
 
-private:
-	enum EModifications
-	{
-		eMod_Added,
-		eMod_OperationType,
+		IColumnsDefinition& InitSubtasksColumns(const ISerializerContainerPtr& spContainer) const;
+		IColumnsDefinition& InitSubtasksInfoColumns(const ISerializerContainerPtr& spContainer) const;
 
-		// last element
-		eMod_Last
-	};
+	private:
+		enum EModifications
+		{
+			eMod_Added,
+			eMod_OperationType,
 
-	typedef std::bitset<eMod_Last> Bitset;
+			// last element
+			eMod_Last
+		};
 
-	TSubTaskContext& m_rSubTaskContext;
+		typedef std::bitset<eMod_Last> Bitset;
 
+		TSubTaskContext& m_rSubTaskContext;
+
 #pragma warning(push)
 #pragma warning(disable: 4251)
-	mutable Bitset m_setModifications;
+		mutable Bitset m_setModifications;
 
-	TSharedModificationTracker<EOperationType, Bitset, eMod_OperationType> m_eOperationType;
+		TSharedModificationTracker<EOperationType, Bitset, eMod_OperationType> m_eOperationType;
 
-	std::vector<std::pair<TSubTaskBasePtr, bool> > m_vSubTasks;	// pointer to the subtask object / is this the part of estimation?
+		std::vector<std::pair<TSubTaskBasePtr, bool> > m_vSubTasks;	// pointer to the subtask object / is this the part of estimation?
 
-	mutable std::atomic<object_id_t> m_oidSubOperationIndex;		 // index of sub-operation from TOperationDescription
+		mutable std::atomic<object_id_t> m_oidSubOperationIndex;		 // index of sub-operation from TOperationDescription
 
 #pragma warning(pop)
 
-	mutable object_id_t m_oidLastStoredIndex;
+		mutable object_id_t m_oidLastStoredIndex;
 
-	friend class TScopedRunningTimeTracker;
-};
+		friend class TScopedRunningTimeTracker;
+	};
+}
 
-END_CHCORE_NAMESPACE
-
 #endif