Index: src/libchcore/TSharedModificationTracker.h
===================================================================
diff -u -N -r95a466ca0a4f95851dcacf2b80e2084e0168b7e4 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TSharedModificationTracker.h	(.../TSharedModificationTracker.h)	(revision 95a466ca0a4f95851dcacf2b80e2084e0168b7e4)
+++ src/libchcore/TSharedModificationTracker.h	(.../TSharedModificationTracker.h)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -21,98 +21,97 @@
 
 #include "libchcore.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-template<class T, class Bitset, size_t ChangeBit>
-class TSharedModificationTracker
+namespace chcore
 {
-public:
-	typedef T value_type;
-
-public:
-	TSharedModificationTracker(Bitset& rBitset) :
-		m_tValue(),
-		m_rBitset(rBitset)
+	template<class T, class Bitset, size_t ChangeBit>
+	class TSharedModificationTracker
 	{
-		MarkAsModified();
-	}
+	public:
+		typedef T value_type;
 
-	TSharedModificationTracker(const TSharedModificationTracker<T, Bitset, ChangeBit>& rSrc) = delete;
+	public:
+		TSharedModificationTracker(Bitset& rBitset) :
+			m_tValue(),
+			m_rBitset(rBitset)
+		{
+			MarkAsModified();
+		}
 
-	TSharedModificationTracker(const TSharedModificationTracker<T, Bitset, ChangeBit>& rSrc, Bitset& rBitset) :
-		m_tValue(rSrc.m_tValue),
-		m_rBitset(rBitset)
-	{
-		m_rBitset[ChangeBit] = rSrc.m_rBitset[ChangeBit];
-	}
+		TSharedModificationTracker(const TSharedModificationTracker<T, Bitset, ChangeBit>& rSrc) = delete;
 
-	template<class... V>
-	TSharedModificationTracker(Bitset& rBitset, const V&... rValues) :
-		m_tValue(rValues...),
-		m_rBitset(rBitset)
-	{
-		MarkAsModified();
-	}
-
-	TSharedModificationTracker& operator=(const TSharedModificationTracker<T, Bitset, ChangeBit>& rValue)
-	{
-		if(this != &rValue)
+		TSharedModificationTracker(const TSharedModificationTracker<T, Bitset, ChangeBit>& rSrc, Bitset& rBitset) :
+			m_tValue(rSrc.m_tValue),
+			m_rBitset(rBitset)
 		{
-			m_tValue = rValue.m_tValue;
-			m_rBitset[ChangeBit] = rValue.m_rBitset[ChangeBit];
+			m_rBitset[ChangeBit] = rSrc.m_rBitset[ChangeBit];
 		}
 
-		return *this;
-	}
-
-	template<class V>
-	TSharedModificationTracker& operator=(const V& rValue)
-	{
-		if(m_tValue != rValue)
+		template<class... V>
+		TSharedModificationTracker(Bitset& rBitset, const V&... rValues) :
+			m_tValue(rValues...),
+			m_rBitset(rBitset)
 		{
-			m_tValue = rValue;
 			MarkAsModified();
 		}
 
-		return *this;
-	}
+		TSharedModificationTracker& operator=(const TSharedModificationTracker<T, Bitset, ChangeBit>& rValue)
+		{
+			if (this != &rValue)
+			{
+				m_tValue = rValue.m_tValue;
+				m_rBitset[ChangeBit] = rValue.m_rBitset[ChangeBit];
+			}
 
-	operator const T&() const
-	{
-		return m_tValue;
-	}
+			return *this;
+		}
 
-	const T& Get() const
-	{
-		return m_tValue;
-	}
+		template<class V>
+		TSharedModificationTracker& operator=(const V& rValue)
+		{
+			if (m_tValue != rValue)
+			{
+				m_tValue = rValue;
+				MarkAsModified();
+			}
 
-	T& Modify()
-	{
-		MarkAsModified();
-		return m_tValue;
-	}
+			return *this;
+		}
 
-	bool IsModified() const
-	{
-		return m_rBitset[ChangeBit];
-	}
+		operator const T&() const
+		{
+			return m_tValue;
+		}
 
-	void MarkAsModified()
-	{
-		m_rBitset[ChangeBit] = true;
-	}
+		const T& Get() const
+		{
+			return m_tValue;
+		}
 
-	void MarkAsUnmodified()
-	{
-		m_rBitset[ChangeBit] = false;
-	}
+		T& Modify()
+		{
+			MarkAsModified();
+			return m_tValue;
+		}
 
-private:
-	T m_tValue;
-	Bitset& m_rBitset;
-};
+		bool IsModified() const
+		{
+			return m_rBitset[ChangeBit];
+		}
 
-END_CHCORE_NAMESPACE
+		void MarkAsModified()
+		{
+			m_rBitset[ChangeBit] = true;
+		}
 
+		void MarkAsUnmodified()
+		{
+			m_rBitset[ChangeBit] = false;
+		}
+
+	private:
+		T m_tValue;
+		Bitset& m_rBitset;
+	};
+}
+
 #endif