Index: src/libchcore/TTaskBaseData.h
===================================================================
diff -u -N -rfc67a825635691930b3ac00dc95b16e59f3d2fae -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TTaskBaseData.h	(.../TTaskBaseData.h)	(revision fc67a825635691930b3ac00dc95b16e59f3d2fae)
+++ src/libchcore/TTaskBaseData.h	(.../TTaskBaseData.h)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -25,59 +25,58 @@
 #include "TSharedModificationTracker.h"
 #include "ETaskCurrentState.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-class LIBCHCORE_API TTaskBaseData
+namespace chcore
 {
-private:
-	TTaskBaseData(const TTaskBaseData&);
-	TTaskBaseData& operator=(const TTaskBaseData&);
+	class LIBCHCORE_API TTaskBaseData
+	{
+	private:
+		TTaskBaseData(const TTaskBaseData&);
+		TTaskBaseData& operator=(const TTaskBaseData&);
 
-public:
-	TTaskBaseData();
-	~TTaskBaseData();
+	public:
+		TTaskBaseData();
+		~TTaskBaseData();
 
-	TString GetTaskName() const;
-	void SetTaskName(const TString& strTaskName);
+		TString GetTaskName() const;
+		void SetTaskName(const TString& strTaskName);
 
-	ETaskCurrentState GetCurrentState() const;
-	void SetCurrentState(ETaskCurrentState eCurrentState);
+		ETaskCurrentState GetCurrentState() const;
+		void SetCurrentState(ETaskCurrentState eCurrentState);
 
-	TSmartPath GetLogPath() const;
-	void SetLogPath(const TSmartPath& pathLog);
+		TSmartPath GetLogPath() const;
+		void SetLogPath(const TSmartPath& pathLog);
 
-	TSmartPath GetDestinationPath() const;
-	void SetDestinationPath(const TSmartPath& pathDst);
+		TSmartPath GetDestinationPath() const;
+		void SetDestinationPath(const TSmartPath& pathDst);
 
-	void Store(const ISerializerContainerPtr& spContainer) const;
-	void Load(const ISerializerContainerPtr& spContainer);
+		void Store(const ISerializerContainerPtr& spContainer) const;
+		void Load(const ISerializerContainerPtr& spContainer);
 
-	void InitColumns(const ISerializerContainerPtr& spContainer) const;
+		void InitColumns(const ISerializerContainerPtr& spContainer) const;
 
-private:
-	enum EModifications
-	{
-		eMod_Added,
-		eMod_TaskName,
-		eMod_CurrentState,
-		eMod_LogPath,
-		eMod_DstPath,
+	private:
+		enum EModifications
+		{
+			eMod_Added,
+			eMod_TaskName,
+			eMod_CurrentState,
+			eMod_LogPath,
+			eMod_DstPath,
 
-		eMod_Last
-	};
+			eMod_Last
+		};
 
 #pragma warning(push)
 #pragma warning(disable: 4251)
-	typedef std::bitset<eMod_Last> ModBitSet;
-	mutable ModBitSet m_setChanges;
+		typedef std::bitset<eMod_Last> ModBitSet;
+		mutable ModBitSet m_setChanges;
 
-	TSharedModificationTracker<TString, ModBitSet, eMod_TaskName> m_strTaskName;
-	TSharedModificationTracker<volatile ETaskCurrentState, ModBitSet, eMod_CurrentState> m_eCurrentState;     // current state of processing this task represents
-	TSharedModificationTracker<TSmartPath, ModBitSet, eMod_LogPath> m_pathLog;
-	TSharedModificationTracker<TSmartPath, ModBitSet, eMod_DstPath> m_pathDestinationPath;
+		TSharedModificationTracker<TString, ModBitSet, eMod_TaskName> m_strTaskName;
+		TSharedModificationTracker<volatile ETaskCurrentState, ModBitSet, eMod_CurrentState> m_eCurrentState;     // current state of processing this task represents
+		TSharedModificationTracker<TSmartPath, ModBitSet, eMod_LogPath> m_pathLog;
+		TSharedModificationTracker<TSmartPath, ModBitSet, eMod_DstPath> m_pathDestinationPath;
 #pragma warning(pop)
-};
+	};
+}
 
-END_CHCORE_NAMESPACE
-
 #endif