Index: src/libchcore/TSubTaskContext.h
===================================================================
diff -u -N -r2efd22688b8d12be34c87bf2b024d8db6e317d60 -ra7834ba278464cb62739f22d35f9bc16269706a1
--- src/libchcore/TSubTaskContext.h	(.../TSubTaskContext.h)	(revision 2efd22688b8d12be34c87bf2b024d8db6e317d60)
+++ src/libchcore/TSubTaskContext.h	(.../TSubTaskContext.h)	(revision a7834ba278464cb62739f22d35f9bc16269706a1)
@@ -27,6 +27,7 @@
 #include "TPath.h"
 #include "EOperationTypes.h"
 #include "IFeedbackHandler.h"
+#include "TBasePathData.h"
 
 namespace icpf
 {
@@ -37,7 +38,6 @@
 
 class TWorkerThreadController;
 class TModPathContainer;
-class TBasePathDataContainer;
 class TTaskConfigTracker;
 class TLocalFilesystem;
 class TTaskLocalStatsInfo;
@@ -51,10 +51,9 @@
 class LIBCHCORE_API TSubTaskContext
 {
 public:
-	TSubTaskContext(TConfig& rConfig, TModPathContainer& rBasePaths,
-		TBasePathDataContainer& rBasePathDataContainer, TFileInfoArray& rFilesCache,
-		TTaskConfigTracker& rCfgTracker, icpf::log_file& rLog,
-		const IFeedbackHandlerPtr& spFeedbackHandler, TWorkerThreadController& rThreadController, TLocalFilesystem& rfsLocal);
+	TSubTaskContext(TConfig& rConfig, const TBasePathDataContainerPtr& spBasePaths, TFileInfoArray& rFilesCache,
+		TTaskConfigTracker& rCfgTracker, icpf::log_file& rLog, const IFeedbackHandlerPtr& spFeedbackHandler,
+		TWorkerThreadController& rThreadController, TLocalFilesystem& rfsLocal);
 	~TSubTaskContext();
 
 	TConfig& GetConfig();
@@ -63,12 +62,8 @@
 	chcore::EOperationType GetOperationType() const;
 	void SetOperationType(chcore::EOperationType eOperationType);
 
-	TBasePathDataContainer& GetBasePathDataContainer();
-	const TBasePathDataContainer& GetBasePathDataContainer() const;
+	TBasePathDataContainerPtr GetBasePaths() const;
 
-	TModPathContainer& GetBasePaths();
-	const TModPathContainer& GetBasePaths() const;
-
 	TFileInfoArray& GetFilesCache();
 	const TFileInfoArray& GetFilesCache() const;
 
@@ -99,8 +94,10 @@
 	EOperationType m_eOperationType;
 
 	// information about input paths
-	TModPathContainer& m_rBasePaths;
-	TBasePathDataContainer& m_rBasePathDataContainer;
+#pragma warning(push)
+#pragma warning(disable: 4251)
+	TBasePathDataContainerPtr m_spBasePaths;
+#pragma warning(pop)
 
 	// data on which to operate
 	TFileInfoArray& m_rFilesCache;