Index: src/libchcore/TConfigNotifier.h
===================================================================
diff -u -N -r960167a493c3ae7ecbdc7e8c2b91619106d7a685 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TConfigNotifier.h	(.../TConfigNotifier.h)	(revision 960167a493c3ae7ecbdc7e8c2b91619106d7a685)
+++ src/libchcore/TConfigNotifier.h	(.../TConfigNotifier.h)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -22,26 +22,25 @@
 #include "libchcore.h"
 #include "TStringSet.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-// class defines configuration change notification record; not to be used outside
-class TConfigNotifier
+namespace chcore
 {
-public:
-	TConfigNotifier(void (*pfnCallback)(const TStringSet&, void*), void* pParam);
-	~TConfigNotifier();
+	// class defines configuration change notification record; not to be used outside
+	class TConfigNotifier
+	{
+	public:
+		TConfigNotifier(void(*pfnCallback)(const TStringSet&, void*), void* pParam);
+		~TConfigNotifier();
 
-	void operator()(const TStringSet& rsetPropNames);
+		void operator()(const TStringSet& rsetPropNames);
 
-	TConfigNotifier& operator=(const TConfigNotifier& rNotifier);
+		TConfigNotifier& operator=(const TConfigNotifier& rNotifier);
 
-	bool operator==(const TConfigNotifier& rNotifier) const;
+		bool operator==(const TConfigNotifier& rNotifier) const;
 
-private:
-	void (*m_pfnCallback)(const TStringSet&, void*);
-	void* m_pParam;
-};
+	private:
+		void(*m_pfnCallback)(const TStringSet&, void*);
+		void* m_pParam;
+	};
+}
 
-END_CHCORE_NAMESPACE
-
 #endif