Index: src/libchcore/TFileInfoArray.h
===================================================================
diff -u -N -re92d7e2b63df1305b23aa04132c45ad8747dc22c -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/TFileInfoArray.h	(.../TFileInfoArray.h)	(revision e92d7e2b63df1305b23aa04132c45ad8747dc22c)
+++ src/libchcore/TFileInfoArray.h	(.../TFileInfoArray.h)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -27,59 +27,58 @@
 #include "TBasePathData.h"
 #include "CommonDataTypes.h"
 
-BEGIN_CHCORE_NAMESPACE
-
-class TFileInfo;
-typedef boost::shared_ptr<TFileInfo> TFileInfoPtr;
-
-class LIBCHCORE_API TFileInfoArray
+namespace chcore
 {
-public:
-	TFileInfoArray();
-	~TFileInfoArray();
+	class TFileInfo;
+	typedef boost::shared_ptr<TFileInfo> TFileInfoPtr;
 
-	// Adds a new object info to this container
-	void AddFileInfo(const TFileInfoPtr& spFileInfo);
+	class LIBCHCORE_API TFileInfoArray
+	{
+	public:
+		TFileInfoArray();
+		~TFileInfoArray();
 
-	/// Retrieves count of elements in this object
-	file_count_t GetSize() const;
+		// Adds a new object info to this container
+		void AddFileInfo(const TFileInfoPtr& spFileInfo);
 
-	/// Retrieves an element at the specified index
-	TFileInfoPtr GetAt(file_count_t stIndex) const;
+		/// Retrieves count of elements in this object
+		file_count_t GetSize() const;
 
-	/// Retrieves a copy of the element at a specified index
-	TFileInfo GetCopyAt(file_count_t stIndex) const;
+		/// Retrieves an element at the specified index
+		TFileInfoPtr GetAt(file_count_t stIndex) const;
 
-	/// Removes all elements from this object
-	void Clear();
+		/// Retrieves a copy of the element at a specified index
+		TFileInfo GetCopyAt(file_count_t stIndex) const;
 
-	// specialized operations on contents of m_vFiles
-	/// Calculates the size of the first fcCount file info objects
-	unsigned long long CalculatePartialSize(file_count_t fcCount);
+		/// Removes all elements from this object
+		void Clear();
 
-	/// Calculates the size of all file info objects inside this object
-	unsigned long long CalculateTotalSize() const;
+		// specialized operations on contents of m_vFiles
+		/// Calculates the size of the first fcCount file info objects
+		unsigned long long CalculatePartialSize(file_count_t fcCount);
 
-	void SetComplete(bool bComplete);
-	bool IsComplete() const;
+		/// Calculates the size of all file info objects inside this object
+		unsigned long long CalculateTotalSize() const;
 
-	void Store(const ISerializerContainerPtr& spContainer) const;
-	void Load(const ISerializerContainerPtr& spContainer, const TBasePathDataContainerPtr& spBasePaths);
+		void SetComplete(bool bComplete);
+		bool IsComplete() const;
 
-	void InitColumns(const ISerializerContainerPtr& spContainer) const;
+		void Store(const ISerializerContainerPtr& spContainer) const;
+		void Load(const ISerializerContainerPtr& spContainer, const TBasePathDataContainerPtr& spBasePaths);
 
-protected:
-	bool m_bComplete;
+		void InitColumns(const ISerializerContainerPtr& spContainer) const;
 
+	protected:
+		bool m_bComplete;
+
 #pragma warning(push)
 #pragma warning(disable: 4251)
-	mutable TRemovedObjects m_setRemovedObjects;
-	std::vector<TFileInfoPtr> m_vFiles;
-	mutable boost::shared_mutex m_lock;
+		mutable TRemovedObjects m_setRemovedObjects;
+		std::vector<TFileInfoPtr> m_vFiles;
+		mutable boost::shared_mutex m_lock;
 #pragma warning(pop)
-	object_id_t m_oidLastObjectID;
-};
+		object_id_t m_oidLastObjectID;
+	};
+}
 
-END_CHCORE_NAMESPACE
-
 #endif