Index: src/libchcore/TStringSet.cpp
===================================================================
diff -u -N -rdd61ac70dd276425fe97970b49b6854d02bfcc87 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TStringSet.cpp	(.../TStringSet.cpp)	(revision dd61ac70dd276425fe97970b49b6854d02bfcc87)
+++ src/libchcore/TStringSet.cpp	(.../TStringSet.cpp)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -23,167 +23,166 @@
 #include "stdafx.h"
 #include "TStringSet.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-///////////////////////////////////////////////////////////////////////////////////////////
-// class TStringSetIterator
-
-TStringSetIterator::TStringSetIterator(std::set<TString>::iterator iterSet) :
-	m_iterSet(iterSet)
+namespace chcore
 {
-}
+	///////////////////////////////////////////////////////////////////////////////////////////
+	// class TStringSetIterator
 
-TStringSetIterator::TStringSetIterator()
-{
+	TStringSetIterator::TStringSetIterator(std::set<TString>::iterator iterSet) :
+		m_iterSet(iterSet)
+	{
+	}
 
-}
+	TStringSetIterator::TStringSetIterator()
+	{
 
-TStringSetIterator::~TStringSetIterator()
-{
+	}
 
-}
+	TStringSetIterator::~TStringSetIterator()
+	{
 
-TStringSetIterator TStringSetIterator::operator++(int)
-{
-	TStringSetIterator iterCurrent(m_iterSet);
-	++m_iterSet;
-	return iterCurrent;
-}
+	}
 
-TStringSetIterator& TStringSetIterator::operator++()
-{
-	++m_iterSet;
-	return *this;
-}
+	TStringSetIterator TStringSetIterator::operator++(int)
+	{
+		TStringSetIterator iterCurrent(m_iterSet);
+		++m_iterSet;
+		return iterCurrent;
+	}
 
-bool TStringSetIterator::operator==(const TStringSetIterator& rSrc) const
-{
-	return m_iterSet == rSrc.m_iterSet;
-}
+	TStringSetIterator& TStringSetIterator::operator++()
+	{
+		++m_iterSet;
+		return *this;
+	}
 
-bool TStringSetIterator::operator!=(const TStringSetIterator& rSrc) const
-{
-	return m_iterSet != rSrc.m_iterSet;
-}
+	bool TStringSetIterator::operator==(const TStringSetIterator& rSrc) const
+	{
+		return m_iterSet == rSrc.m_iterSet;
+	}
 
-const TString& TStringSetIterator::operator*() const
-{
-	return *m_iterSet;
-}
+	bool TStringSetIterator::operator!=(const TStringSetIterator& rSrc) const
+	{
+		return m_iterSet != rSrc.m_iterSet;
+	}
 
-///////////////////////////////////////////////////////////////////////////////////////////
-// class TStringSetConstIterator
+	const TString& TStringSetIterator::operator*() const
+	{
+		return *m_iterSet;
+	}
 
-TStringSetConstIterator::TStringSetConstIterator(std::set<TString>::const_iterator iterSet) :
-	m_iterSet(iterSet)
-{
-}
+	///////////////////////////////////////////////////////////////////////////////////////////
+	// class TStringSetConstIterator
 
-TStringSetConstIterator::TStringSetConstIterator()
-{
+	TStringSetConstIterator::TStringSetConstIterator(std::set<TString>::const_iterator iterSet) :
+		m_iterSet(iterSet)
+	{
+	}
 
-}
+	TStringSetConstIterator::TStringSetConstIterator()
+	{
 
-TStringSetConstIterator::~TStringSetConstIterator()
-{
+	}
 
-}
+	TStringSetConstIterator::~TStringSetConstIterator()
+	{
 
-TStringSetConstIterator TStringSetConstIterator::operator++(int)
-{
-	TStringSetConstIterator iterCurrent(m_iterSet);
-	++m_iterSet;
-	return iterCurrent;
-}
+	}
 
-TStringSetConstIterator& TStringSetConstIterator::operator++()
-{
-	++m_iterSet;
-	return *this;
-}
+	TStringSetConstIterator TStringSetConstIterator::operator++(int)
+	{
+		TStringSetConstIterator iterCurrent(m_iterSet);
+		++m_iterSet;
+		return iterCurrent;
+	}
 
-bool TStringSetConstIterator::operator==(const TStringSetConstIterator& rSrc) const
-{
-	return m_iterSet == rSrc.m_iterSet;
-}
+	TStringSetConstIterator& TStringSetConstIterator::operator++()
+	{
+		++m_iterSet;
+		return *this;
+	}
 
-bool TStringSetConstIterator::operator!=(const TStringSetConstIterator& rSrc) const
-{
-	return m_iterSet != rSrc.m_iterSet;
-}
+	bool TStringSetConstIterator::operator==(const TStringSetConstIterator& rSrc) const
+	{
+		return m_iterSet == rSrc.m_iterSet;
+	}
 
-const TString& TStringSetConstIterator::operator*() const
-{
-	return *m_iterSet;
-}
+	bool TStringSetConstIterator::operator!=(const TStringSetConstIterator& rSrc) const
+	{
+		return m_iterSet != rSrc.m_iterSet;
+	}
 
-///////////////////////////////////////////////////////////////////////////////////////////
-// class TStringSet
+	const TString& TStringSetConstIterator::operator*() const
+	{
+		return *m_iterSet;
+	}
 
-TStringSet::TStringSet()
-{
-}
+	///////////////////////////////////////////////////////////////////////////////////////////
+	// class TStringSet
 
-TStringSet::~TStringSet()
-{
-}
+	TStringSet::TStringSet()
+	{
+	}
 
-void TStringSet::Insert(const TString& str)
-{
-	m_setItems.insert(str);
-}
+	TStringSet::~TStringSet()
+	{
+	}
 
-void TStringSet::Insert(const TStringSet& setStrings)
-{
-	m_setItems.insert(setStrings.m_setItems.begin(), setStrings.m_setItems.end());
-}
+	void TStringSet::Insert(const TString& str)
+	{
+		m_setItems.insert(str);
+	}
 
-void TStringSet::Remove(const TString& str)
-{
-	std::set<TString>::iterator iter = m_setItems.find(str);
-	if(iter != m_setItems.end())
-		m_setItems.erase(iter);
-}
+	void TStringSet::Insert(const TStringSet& setStrings)
+	{
+		m_setItems.insert(setStrings.m_setItems.begin(), setStrings.m_setItems.end());
+	}
 
-void TStringSet::Clear()
-{
-	m_setItems.clear();
-}
+	void TStringSet::Remove(const TString& str)
+	{
+		std::set<TString>::iterator iter = m_setItems.find(str);
+		if (iter != m_setItems.end())
+			m_setItems.erase(iter);
+	}
 
-bool TStringSet::HasValue(const TString& str) const
-{
-	std::set<TString>::const_iterator iter = m_setItems.find(str);
-	return (iter != m_setItems.end());
-}
+	void TStringSet::Clear()
+	{
+		m_setItems.clear();
+	}
 
-size_t TStringSet::GetCount() const
-{
-	return m_setItems.size();
-}
+	bool TStringSet::HasValue(const TString& str) const
+	{
+		std::set<TString>::const_iterator iter = m_setItems.find(str);
+		return (iter != m_setItems.end());
+	}
 
-bool TStringSet::IsEmpty() const
-{
-	return m_setItems.empty();
-}
+	size_t TStringSet::GetCount() const
+	{
+		return m_setItems.size();
+	}
 
-TStringSetIterator TStringSet::Begin()
-{
-	return TStringSetIterator(m_setItems.begin());
-}
+	bool TStringSet::IsEmpty() const
+	{
+		return m_setItems.empty();
+	}
 
-TStringSetIterator TStringSet::End()
-{
-	return TStringSetIterator(m_setItems.end());
-}
+	TStringSetIterator TStringSet::Begin()
+	{
+		return TStringSetIterator(m_setItems.begin());
+	}
 
-TStringSetConstIterator TStringSet::Begin() const
-{
-	return TStringSetConstIterator(m_setItems.begin());
-}
+	TStringSetIterator TStringSet::End()
+	{
+		return TStringSetIterator(m_setItems.end());
+	}
 
-TStringSetConstIterator TStringSet::End() const
-{
-	return TStringSetConstIterator(m_setItems.end());
-}
+	TStringSetConstIterator TStringSet::Begin() const
+	{
+		return TStringSetConstIterator(m_setItems.begin());
+	}
 
-END_CHCORE_NAMESPACE
+	TStringSetConstIterator TStringSet::End() const
+	{
+		return TStringSetConstIterator(m_setItems.end());
+	}
+}