Index: src/libchcore/TModPathContainer.h
===================================================================
diff -u -N -rfc67a825635691930b3ac00dc95b16e59f3d2fae -ra44714d5c7ec0f50a376f4d0ea919ee5a224f834
--- src/libchcore/TModPathContainer.h	(.../TModPathContainer.h)	(revision fc67a825635691930b3ac00dc95b16e59f3d2fae)
+++ src/libchcore/TModPathContainer.h	(.../TModPathContainer.h)	(revision a44714d5c7ec0f50a376f4d0ea919ee5a224f834)
@@ -43,19 +43,19 @@
 
 	const TSmartPath& GetAt(size_t stIndex) const;
 	TSmartPath& GetAt(size_t stIndex);
-	size_t GetOidAt(size_t stIndex) const;
+	object_id_t GetOidAt(size_t stIndex) const;
 
 	void SetAt(size_t stIndex, const TSmartPath& spPath);
 
 	void DeleteAt(size_t stIndex);
 #pragma endregion
 
 #pragma region Object id-based interface
-	const TSmartPath& GetAtOid(size_t stObjectID) const;
-	TSmartPath& GetAtOid(size_t stObjectID);
+	const TSmartPath& GetAtOid(object_id_t oidObjectID) const;
+	TSmartPath& GetAtOid(object_id_t oidObjectID);
 
-	void SetByOid(size_t stObjectID, const TSmartPath& spPath);
-	void DeleteOid(size_t stObjectID);
+	void SetByOid(object_id_t oidObjectID, const TSmartPath& spPath);
+	void DeleteOid(object_id_t oidObjectID);
 #pragma endregion
 
 #pragma region Generic interface
@@ -82,10 +82,10 @@
 #pragma warning(push)
 #pragma warning(disable: 4251)
 	mutable TRemovedObjects m_setRemovedItems;
-	typedef boost::container::flat_map<size_t, TModificationTracker<TSmartPath> > DataMap;
+	typedef boost::container::flat_map<object_id_t, TModificationTracker<TSmartPath> > DataMap;
 	DataMap m_vPaths;
 #pragma warning(pop)
-	size_t m_stNextObjectID;
+	object_id_t m_oidNextObjectID;
 };
 
 END_CHCORE_NAMESPACE