Modified TskPipeline class to prohibit copying of TskPipeline objects

robjoyce · May 24, 2012 · 968356a · 968356a
1 parent b18f7a0
commit 968356a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/framework/Pipeline/TskPipeline.cpp b/framework/Pipeline/TskPipeline.cpp
@@ -45,11 +45,6 @@ TskPipeline::TskPipeline() : m_hasExeModule(false), m_loadDll(true)
 {
 }
 
-TskPipeline::TskPipeline(TskPipeline& pipeline) : m_hasExeModule(false), m_loadDll(true)
-{
-    m_modules = pipeline.m_modules;
-}
-
 TskPipeline::~TskPipeline()
 {
     // Delete modules

diff --git a/framework/Pipeline/TskPipeline.h b/framework/Pipeline/TskPipeline.h
@@ -43,13 +43,7 @@ class TSK_FRAMEWORK_API TskPipeline
     static const std::string MODULE_EXECUTABLE_TYPE; ///< value of MODULE_TYPE_ATTR for executable modules
     static const std::string MODULE_PLUGIN_TYPE; ///< value of MODULE_TYPE_ATTR for library modules
 
-    // Default constructor
     TskPipeline();
-
-    // Copy constructor
-    TskPipeline(TskPipeline& pipeline);
-
-    // Destructor
     ~TskPipeline();
 
     void validate(const std::string& pipelineConfig);
@@ -91,6 +85,10 @@ class TSK_FRAMEWORK_API TskPipeline
     bool excludeFile(const TskFile*);
 
 private:
+    // Disallow copying
+    TskPipeline(const TskPipeline&);
+    TskPipeline& operator=(const TskPipeline&);
+
     bool m_loadDll;     ///< True if dlls should be loaded during initialize
 
     TskModule * createModule(Poco::XML::Element * pElem);