From fc6e3c0cabec18cac258b67bd2b9e7164ab21188 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Fri, 3 Aug 2012 14:31:10 +0200 Subject: [PATCH] Changed: #1440 Some details --HG-- branch : build_pipeline_v3 --- .../tools/pipeline/service/module_pipeline_slave.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/code/nel/tools/pipeline/service/module_pipeline_slave.cpp b/code/nel/tools/pipeline/service/module_pipeline_slave.cpp index 3eaa45664..3088b5828 100644 --- a/code/nel/tools/pipeline/service/module_pipeline_slave.cpp +++ b/code/nel/tools/pipeline/service/module_pipeline_slave.cpp @@ -232,6 +232,9 @@ public: masterUpdatedDatabaseStatus(NULL); } break; + default: + // Nothing to do for now + break; } // TODO: ABORT RUNNING BUILD PROCESS @@ -521,9 +524,11 @@ public: } } } - std::copy(m_DependentDirectories.begin(), m_DependentDirectories.end(), m_ListDependentDirectories.end()); + for (std::vector::iterator it = m_DependentDirectories.begin(), end = m_DependentDirectories.end(); it != end; ++it) + m_ListDependentDirectories.insert(*it); m_DependentDirectories.clear(); - std::copy(m_DependentFiles.begin(), m_DependentFiles.end(), m_ListDependentFiles.end()); + for (std::vector::iterator it = m_DependentFiles.begin(), end = m_DependentFiles.end(); it != end; ++it) + m_ListDependentFiles.insert(*it); m_DependentFiles.clear(); m_SubTaskResult = FINISH_SUCCESS; } @@ -970,7 +975,7 @@ public: } /// Set the exit message, exit the plugin immediately afterwards. - bool setExit(const TProcessResult exitLevel, const std::string &exitMessage) + void setExit(const TProcessResult exitLevel, const std::string &exitMessage) { m_SubTaskResult = exitLevel; m_SubTaskErrorMessage = exitMessage;