Index: src/libchcore/TSubTaskArray.h
===================================================================
diff -u -N -rfc67a825635691930b3ac00dc95b16e59f3d2fae -ra44714d5c7ec0f50a376f4d0ea919ee5a224f834
--- src/libchcore/TSubTaskArray.h	(.../TSubTaskArray.h)	(revision fc67a825635691930b3ac00dc95b16e59f3d2fae)
+++ src/libchcore/TSubTaskArray.h	(.../TSubTaskArray.h)	(revision a44714d5c7ec0f50a376f4d0ea919ee5a224f834)
@@ -91,10 +91,10 @@
 
 	std::vector<std::pair<TSubTaskBasePtr, bool> > m_vSubTasks;	// pointer to the subtask object / is this the part of estimation?
 
-	mutable boost::atomic<long> m_lSubOperationIndex;		 // index of sub-operation from TOperationDescription
+	mutable boost::atomic<object_id_t> m_oidSubOperationIndex;		 // index of sub-operation from TOperationDescription
 #pragma warning(pop)
 
-	mutable long m_lLastStoredIndex;
+	mutable object_id_t m_oidLastStoredIndex;
 
 	friend class TTaskProcessingGuard;
 };