Index: src/libchcore/TSimpleTimer.cpp
===================================================================
diff -u -N -r5693271a6736f524997e3951fc7b7b6323bc6447 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TSimpleTimer.cpp	(.../TSimpleTimer.cpp)	(revision 5693271a6736f524997e3951fc7b7b6323bc6447)
+++ src/libchcore/TSimpleTimer.cpp	(.../TSimpleTimer.cpp)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -20,86 +20,85 @@
 #include "TSimpleTimer.h"
 #include "TTimestampProviderTickCount.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-TSimpleTimer::TSimpleTimer(bool bAutostart, const ITimestampProviderPtr& spTimestampProvider) :
-	m_spTimestampProvider(spTimestampProvider),
-	m_bStarted(false),
-	m_ullLastTime(0),
-	m_ullTotalTime(0)
+namespace chcore
 {
-	if(!spTimestampProvider)
-		m_spTimestampProvider = ITimestampProviderPtr(new TTimestampProviderTickCount);
+	TSimpleTimer::TSimpleTimer(bool bAutostart, const ITimestampProviderPtr& spTimestampProvider) :
+		m_spTimestampProvider(spTimestampProvider),
+		m_bStarted(false),
+		m_ullLastTime(0),
+		m_ullTotalTime(0)
+	{
+		if (!spTimestampProvider)
+			m_spTimestampProvider = ITimestampProviderPtr(new TTimestampProviderTickCount);
 
-	if(bAutostart)
-		Start();
-}
+		if (bAutostart)
+			Start();
+	}
 
-TSimpleTimer::~TSimpleTimer()
-{
-}
+	TSimpleTimer::~TSimpleTimer()
+	{
+	}
 
-void TSimpleTimer::Start()
-{
-	if(!m_bStarted)
+	void TSimpleTimer::Start()
 	{
-		m_bStarted = true;
-		m_ullLastTime = m_spTimestampProvider->GetCurrentTimestamp();
+		if (!m_bStarted)
+		{
+			m_bStarted = true;
+			m_ullLastTime = m_spTimestampProvider->GetCurrentTimestamp();
+		}
 	}
-}
 
-unsigned long long TSimpleTimer::Stop()
-{
-	if(m_bStarted)
+	unsigned long long TSimpleTimer::Stop()
 	{
-		Tick();
-		m_bStarted = false;
+		if (m_bStarted)
+		{
+			Tick();
+			m_bStarted = false;
+		}
+
+		return m_ullTotalTime;
 	}
 
-	return m_ullTotalTime;
-}
+	unsigned long long TSimpleTimer::Tick()
+	{
+		unsigned long long ullCurrent = m_spTimestampProvider->GetCurrentTimestamp();
+		if (m_bStarted)
+			m_ullTotalTime += ullCurrent - m_ullLastTime;
+		m_ullLastTime = ullCurrent;
 
-unsigned long long TSimpleTimer::Tick()
-{
-	unsigned long long ullCurrent = m_spTimestampProvider->GetCurrentTimestamp();
-	if(m_bStarted)
-		m_ullTotalTime += ullCurrent - m_ullLastTime;
-	m_ullLastTime = ullCurrent;
+		return ullCurrent;
+	}
 
-	return ullCurrent;
-}
+	unsigned long long TSimpleTimer::Checkpoint()
+	{
+		if (m_bStarted)
+		{
+			Tick();
+			unsigned long long ullCurrentTotal = m_ullTotalTime;
+			m_ullTotalTime = 0;
 
-unsigned long long TSimpleTimer::Checkpoint()
-{
-	if(m_bStarted)
+			return ullCurrentTotal;
+		}
+		else
+			return 0;
+	}
+
+	void TSimpleTimer::Reset()
 	{
-		Tick();
-		unsigned long long ullCurrentTotal = m_ullTotalTime;
+		m_bStarted = false;
+		m_ullLastTime = 0;
 		m_ullTotalTime = 0;
+	}
 
-		return ullCurrentTotal;
+	void TSimpleTimer::Init(unsigned long long ullTotalTime)
+	{
+		Stop();
+		m_ullTotalTime = ullTotalTime;
+		m_ullLastTime = 0;
 	}
-	else
-		return 0;
-}
 
-void TSimpleTimer::Reset()
-{
-	m_bStarted = false;
-	m_ullLastTime = 0;
-	m_ullTotalTime = 0;
+	bool TSimpleTimer::IsRunning() const
+	{
+		return m_bStarted;
+	}
 }
-
-void TSimpleTimer::Init(unsigned long long ullTotalTime)
-{
-	Stop();
-	m_ullTotalTime = ullTotalTime;
-	m_ullLastTime = 0;
-}
-
-bool TSimpleTimer::IsRunning() const
-{
-	return m_bStarted;
-}
-
-END_CHCORE_NAMESPACE