Index: src/libchcore/TTaskInfo.h
===================================================================
diff -u -N -r95a466ca0a4f95851dcacf2b80e2084e0168b7e4 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TTaskInfo.h	(.../TTaskInfo.h)	(revision 95a466ca0a4f95851dcacf2b80e2084e0168b7e4)
+++ src/libchcore/TTaskInfo.h	(.../TTaskInfo.h)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -29,98 +29,97 @@
 #include <bitset>
 #include "TSharedModificationTracker.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-class TTask;
-typedef boost::shared_ptr<TTask> TTaskPtr;
-
-class LIBCHCORE_API TTaskInfoEntry
+namespace chcore
 {
-public:
-	enum EModifications
+	class TTask;
+	typedef boost::shared_ptr<TTask> TTaskPtr;
+
+	class LIBCHCORE_API TTaskInfoEntry
 	{
-		eMod_None = 0,
-		eMod_Added,
-		eMod_TaskPath,
-		eMod_Order,
+	public:
+		enum EModifications
+		{
+			eMod_None = 0,
+			eMod_Added,
+			eMod_TaskPath,
+			eMod_Order,
 
-		eMod_Last
-	};
+			eMod_Last
+		};
 
-public:
-	TTaskInfoEntry();
-	TTaskInfoEntry(object_id_t oidTaskID, const TSmartPath& pathTask, int iOrder, const TTaskPtr& spTask);
-	TTaskInfoEntry(const TTaskInfoEntry& rSrc);
+	public:
+		TTaskInfoEntry();
+		TTaskInfoEntry(object_id_t oidTaskID, const TSmartPath& pathTask, int iOrder, const TTaskPtr& spTask);
+		TTaskInfoEntry(const TTaskInfoEntry& rSrc);
 
-	TTaskInfoEntry& operator=(const TTaskInfoEntry& rSrc);
+		TTaskInfoEntry& operator=(const TTaskInfoEntry& rSrc);
 
-	object_id_t GetObjectID() const;
+		object_id_t GetObjectID() const;
 
-	TSmartPath GetTaskSerializeLocation() const;
-	void SetTaskSerializeLocation(const TSmartPath& pathTask);
+		TSmartPath GetTaskSerializeLocation() const;
+		void SetTaskSerializeLocation(const TSmartPath& pathTask);
 
-	TTaskPtr GetTask() const;
-	void SetTask(const TTaskPtr& spTask);
+		TTaskPtr GetTask() const;
+		void SetTask(const TTaskPtr& spTask);
 
-	int GetOrder() const;
-	void SetOrder(int iOrder);
+		int GetOrder() const;
+		void SetOrder(int iOrder);
 
-	void Store(const ISerializerContainerPtr& spContainer) const;
-	static void InitColumns(IColumnsDefinition& rColumnDefs);
-	void Load(const ISerializerRowReaderPtr& spRowReader);
+		void Store(const ISerializerContainerPtr& spContainer) const;
+		static void InitColumns(IColumnsDefinition& rColumnDefs);
+		void Load(const ISerializerRowReaderPtr& spRowReader);
 
-	void ResetModifications();
+		void ResetModifications();
 
-private:
+	private:
 #pragma warning(push)
 #pragma warning(disable:4251)
-	object_id_t m_oidObjectID;
-	typedef std::bitset<eMod_Last> Bitset;
-	mutable std::bitset<eMod_Last> m_setModifications;
-	TSharedModificationTracker<TSmartPath, Bitset, eMod_TaskPath> m_pathSerializeLocation;
-	TSharedModificationTracker<int, Bitset, eMod_Order> m_iOrder;
+		object_id_t m_oidObjectID;
+		typedef std::bitset<eMod_Last> Bitset;
+		mutable std::bitset<eMod_Last> m_setModifications;
+		TSharedModificationTracker<TSmartPath, Bitset, eMod_TaskPath> m_pathSerializeLocation;
+		TSharedModificationTracker<int, Bitset, eMod_Order> m_iOrder;
 
-	TTaskPtr m_spTask;
+		TTaskPtr m_spTask;
 #pragma warning(pop)
-};
+	};
 
-class LIBCHCORE_API TTaskInfoContainer
-{
-public:
-	TTaskInfoContainer();
+	class LIBCHCORE_API TTaskInfoContainer
+	{
+	public:
+		TTaskInfoContainer();
 
-	void Add(const TSmartPath& strPath, int iOrder, const TTaskPtr& spTask);
-	void RemoveAt(size_t stIndex);
+		void Add(const TSmartPath& strPath, int iOrder, const TTaskPtr& spTask);
+		void RemoveAt(size_t stIndex);
 
-	TTaskInfoEntry& GetAt(size_t stIndex);
-	const TTaskInfoEntry& GetAt(size_t stIndex) const;
+		TTaskInfoEntry& GetAt(size_t stIndex);
+		const TTaskInfoEntry& GetAt(size_t stIndex) const;
 
-	TTaskInfoEntry& GetAtOid(object_id_t oidObjectID);
+		TTaskInfoEntry& GetAtOid(object_id_t oidObjectID);
 
-	bool GetByTaskID(taskid_t tTaskID, TTaskInfoEntry& rInfo) const;
+		bool GetByTaskID(taskid_t tTaskID, TTaskInfoEntry& rInfo) const;
 
-	size_t GetCount() const;
-	bool IsEmpty() const;
+		size_t GetCount() const;
+		bool IsEmpty() const;
 
-	void Clear();
+		void Clear();
 
-	// modifications management
-	void Store(const ISerializerContainerPtr& spContainer) const;
-	void Load(const ISerializerContainerPtr& spContainer);
+		// modifications management
+		void Store(const ISerializerContainerPtr& spContainer) const;
+		void Load(const ISerializerContainerPtr& spContainer);
 
-	void InitColumns(const ISerializerContainerPtr& spContainer) const;
+		void InitColumns(const ISerializerContainerPtr& spContainer) const;
 
-	void ClearModifications();
+		void ClearModifications();
 
-private:
+	private:
 #pragma warning(push)
 #pragma warning(disable:4251)
-	std::vector<TTaskInfoEntry> m_vTaskInfos;
-	mutable TRemovedObjects m_setRemovedTasks;
+		std::vector<TTaskInfoEntry> m_vTaskInfos;
+		mutable TRemovedObjects m_setRemovedTasks;
 #pragma warning(pop)
-	object_id_t m_oidLastObjectID;
-};
+		object_id_t m_oidLastObjectID;
+	};
+}
 
-END_CHCORE_NAMESPACE
-
 #endif