Index: src/libchcore/TWorkerThreadController.h
===================================================================
diff -u -N -r6103ac74583f2136b821dc67515ed8469abd8155 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TWorkerThreadController.h	(.../TWorkerThreadController.h)	(revision 6103ac74583f2136b821dc67515ed8469abd8155)
+++ src/libchcore/TWorkerThreadController.h	(.../TWorkerThreadController.h)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -28,45 +28,44 @@
 ///////////////////////////////////////////////////////////////////////////
 // TWorkerThreadController
 
-BEGIN_CHCORE_NAMESPACE
-
-class LIBCHCORE_API TWorkerThreadController
+namespace chcore
 {
-public:
-	TWorkerThreadController();
-	~TWorkerThreadController();
+	class LIBCHCORE_API TWorkerThreadController
+	{
+	public:
+		TWorkerThreadController();
+		~TWorkerThreadController();
 
-	// methods to be used outside of the thread being controlled
-	void StartThread(PTHREAD_START_ROUTINE pThreadFunction, PVOID pThreadParam, int iPriority = THREAD_PRIORITY_NORMAL);
-	void SignalThreadToStop();
-	void WaitForThreadToExit();
+		// methods to be used outside of the thread being controlled
+		void StartThread(PTHREAD_START_ROUTINE pThreadFunction, PVOID pThreadParam, int iPriority = THREAD_PRIORITY_NORMAL);
+		void SignalThreadToStop();
+		void WaitForThreadToExit();
 
-	void StopThread();
-	void ChangePriority(int iPriority);
+		void StopThread();
+		void ChangePriority(int iPriority);
 
-	// methods to be used only inside the thread being controlled
-	bool KillRequested(DWORD dwWaitForSignal = 0);
+		// methods to be used only inside the thread being controlled
+		bool KillRequested(DWORD dwWaitForSignal = 0);
 
-	HANDLE GetKillThreadHandle() const;
-protected:
-	void RemoveZombieData(boost::upgrade_lock<boost::shared_mutex>& rUpgradeLock);
+		HANDLE GetKillThreadHandle() const;
+	protected:
+		void RemoveZombieData(boost::upgrade_lock<boost::shared_mutex>& rUpgradeLock);
 
-	void SignalThreadToStop(boost::upgrade_lock<boost::shared_mutex>& rUpgradeLock);
-	void WaitForThreadToExit(boost::upgrade_lock<boost::shared_mutex>& rUpgradeLock);
+		void SignalThreadToStop(boost::upgrade_lock<boost::shared_mutex>& rUpgradeLock);
+		void WaitForThreadToExit(boost::upgrade_lock<boost::shared_mutex>& rUpgradeLock);
 
-private:
-	TWorkerThreadController(const TWorkerThreadController&);
-	TWorkerThreadController& operator=(const TWorkerThreadController&);
+	private:
+		TWorkerThreadController(const TWorkerThreadController&);
+		TWorkerThreadController& operator=(const TWorkerThreadController&);
 
-private:
-	HANDLE m_hThread;
-	HANDLE m_hKillThread;
+	private:
+		HANDLE m_hThread;
+		HANDLE m_hKillThread;
 #pragma warning(push)
 #pragma warning(disable: 4251)
-	boost::shared_mutex m_lock;
+		boost::shared_mutex m_lock;
 #pragma warning(pop)
-};
+	};
+}
 
-END_CHCORE_NAMESPACE
-
 #endif