Index: src/libchcore/TConfigSerializers.h
===================================================================
diff -u -N -r2fe97a93f21771d75901d4b6559057d1ea055104 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TConfigSerializers.h	(.../TConfigSerializers.h)	(revision 2fe97a93f21771d75901d4b6559057d1ea055104)
+++ src/libchcore/TConfigSerializers.h	(.../TConfigSerializers.h)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -26,64 +26,61 @@
 #include "TConfig.h"
 #include "TStringArray.h"
 
-BEGIN_CHCORE_NAMESPACE
-
+namespace chcore
+{
 #ifdef _MFC_VER
 
-// CString config serializer
+	// CString config serializer
+	static void StoreInConfig(const CString& strValue, TConfig& rConfig, PCTSTR pszPropName)
+	{
+		rConfig.SetValue(pszPropName, TString((PCTSTR)strValue));
+	}
 
-static void StoreInConfig(const CString& strValue, TConfig& rConfig, PCTSTR pszPropName)
-{
-	rConfig.SetValue(pszPropName, TString((PCTSTR)strValue));
-}
-
-static bool ReadFromConfig(CString& strValue, const TConfig& rConfig, PCTSTR pszPropName)
-{
-	TString wstrData;
-	bool bRes = rConfig.GetValue(pszPropName, wstrData);
-	if(bRes)
-		strValue = wstrData.c_str();
-	else
-		strValue.Empty();
-	return bRes;
-}
-
-// vector<CString> config serializer
-
-static void StoreInConfig(const std::vector<CString>& vValues, TConfig& rConfig, PCTSTR pszPropName)
-{
-	// convert to vector of wstrings (ineffective; there should be a better way to do this)
-	TStringArray vToStore;
-	BOOST_FOREACH(const CString& strVal, vValues)
+	static bool ReadFromConfig(CString& strValue, const TConfig& rConfig, PCTSTR pszPropName)
 	{
-		vToStore.Add((PCTSTR)strVal);
+		TString wstrData;
+		bool bRes = rConfig.GetValue(pszPropName, wstrData);
+		if (bRes)
+			strValue = wstrData.c_str();
+		else
+			strValue.Empty();
+		return bRes;
 	}
-	
-	rConfig.SetValue(pszPropName, vToStore);
-}
 
-static bool ReadFromConfig(std::vector<CString>& vValues, const TConfig& rConfig, PCTSTR pszPropName)
-{
-	vValues.clear();
+	// vector<CString> config serializer
+	static void StoreInConfig(const std::vector<CString>& vValues, TConfig& rConfig, PCTSTR pszPropName)
+	{
+		// convert to vector of wstrings (ineffective; there should be a better way to do this)
+		TStringArray vToStore;
+		BOOST_FOREACH(const CString& strVal, vValues)
+		{
+			vToStore.Add((PCTSTR)strVal);
+		}
 
-	TStringArray vToConvert;
+		rConfig.SetValue(pszPropName, vToStore);
+	}
 
-	bool bRes = rConfig.GetValue(pszPropName, vToConvert);
-	if(bRes)
+	static bool ReadFromConfig(std::vector<CString>& vValues, const TConfig& rConfig, PCTSTR pszPropName)
 	{
-		for(size_t stIndex = 0; stIndex < vToConvert.GetCount(); ++stIndex)
+		vValues.clear();
+
+		TStringArray vToConvert;
+
+		bool bRes = rConfig.GetValue(pszPropName, vToConvert);
+		if (bRes)
 		{
-			vValues.push_back(vToConvert.GetAt(stIndex).c_str());
+			for (size_t stIndex = 0; stIndex < vToConvert.GetCount(); ++stIndex)
+			{
+				vValues.push_back(vToConvert.GetAt(stIndex).c_str());
+			}
 		}
+
+		return bRes;
 	}
 
-	return bRes;
+#endif
 }
 
-#endif
-
-END_CHCORE_NAMESPACE
-
 CONFIG_STANDALONE_SERIALIZATION(CString)
 CONFIG_STANDALONE_SERIALIZATION(std::vector<CString>)