Index: src/libchcore/TTaskLocalStats.h
===================================================================
diff -u -N -r7d59ab9183c933f2fc2682a95fb5d26cf2f952d7 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TTaskLocalStats.h	(.../TTaskLocalStats.h)	(revision 7d59ab9183c933f2fc2682a95fb5d26cf2f952d7)
+++ src/libchcore/TTaskLocalStats.h	(.../TTaskLocalStats.h)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -30,74 +30,73 @@
 #include "TSharedModificationTracker.h"
 #include "IRunningTimeControl.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-class TTaskLocalStatsInfo;
-class TTaskStatsSnapshot;
-
-class TTaskLocalStatsInfo : public IRunningTimeControl
+namespace chcore
 {
-public:
-	TTaskLocalStatsInfo();
-	~TTaskLocalStatsInfo();
+	class TTaskLocalStatsInfo;
+	class TTaskStatsSnapshot;
 
-	void Clear();
-	void GetSnapshot(TTaskStatsSnapshotPtr& spSnapshot) const;
+	class TTaskLocalStatsInfo : public IRunningTimeControl
+	{
+	public:
+		TTaskLocalStatsInfo();
+		~TTaskLocalStatsInfo();
 
-	void SetCurrentSubOperationType(ESubOperationType eSubOperationType);
+		void Clear();
+		void GetSnapshot(TTaskStatsSnapshotPtr& spSnapshot) const;
 
-	bool IsRunning() const;
+		void SetCurrentSubOperationType(ESubOperationType eSubOperationType);
 
-	void Store(const ISerializerContainerPtr& spContainer) const;
-	void Load(const ISerializerContainerPtr& spContainer);
+		bool IsRunning() const;
 
-	void InitColumns(const ISerializerContainerPtr& spContainer) const;
+		void Store(const ISerializerContainerPtr& spContainer) const;
+		void Load(const ISerializerContainerPtr& spContainer);
 
-protected:
-	// running/not running state
-	virtual void MarkAsRunning() override;
-	virtual void MarkAsNotRunning() override;
+		void InitColumns(const ISerializerContainerPtr& spContainer) const;
 
-	// time tracking
-	virtual void EnableTimeTracking() override;
-	virtual void DisableTimeTracking() override;
+	protected:
+		// running/not running state
+		virtual void MarkAsRunning() override;
+		virtual void MarkAsNotRunning() override;
 
+		// time tracking
+		virtual void EnableTimeTracking() override;
+		virtual void DisableTimeTracking() override;
+
 #pragma warning(push)
 #pragma warning(disable: 4251)
-	void UpdateTime(boost::upgrade_lock<boost::shared_mutex>& lock) const;
+		void UpdateTime(boost::upgrade_lock<boost::shared_mutex>& lock) const;
 #pragma warning(pop)
 
-	void SetTimeElapsed(unsigned long long timeElapsed);
-	unsigned long long GetTimeElapsed();
+		void SetTimeElapsed(unsigned long long timeElapsed);
+		unsigned long long GetTimeElapsed();
 
-private:
-	TTaskLocalStatsInfo(const TTaskLocalStatsInfo&);
-	TTaskLocalStatsInfo& operator=(const TTaskLocalStatsInfo&);
+	private:
+		TTaskLocalStatsInfo(const TTaskLocalStatsInfo&);
+		TTaskLocalStatsInfo& operator=(const TTaskLocalStatsInfo&);
 
-private:
-	enum EModifications
-	{
-		eMod_Added,
-		eMod_Timer,
+	private:
+		enum EModifications
+		{
+			eMod_Added,
+			eMod_Timer,
 
-		eMod_Last
-	};
+			eMod_Last
+		};
 
-	typedef std::bitset<eMod_Last> Bitset;
-	mutable Bitset m_setModifications;
+		typedef std::bitset<eMod_Last> Bitset;
+		mutable Bitset m_setModifications;
 
-	volatile bool m_bTaskIsRunning;
+		volatile bool m_bTaskIsRunning;
 
-	mutable TSharedModificationTracker<TSimpleTimer, Bitset, eMod_Timer> m_tTimer;
+		mutable TSharedModificationTracker<TSimpleTimer, Bitset, eMod_Timer> m_tTimer;
 
 #pragma warning(push)
 #pragma warning(disable: 4251)
-	mutable boost::shared_mutex m_lock;
+		mutable boost::shared_mutex m_lock;
 #pragma warning(pop)
 
-	friend class TScopedRunningTimeTracker;
-};
+		friend class TScopedRunningTimeTracker;
+	};
+}
 
-END_CHCORE_NAMESPACE
-
 #endif