aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/node/mergenode.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'node/mergenode.cpp')
-rw-r--r--node/mergenode.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/node/mergenode.cpp b/node/mergenode.cpp
index 4a11a76..c4c1543 100644
--- a/node/mergenode.cpp
+++ b/node/mergenode.cpp
@@ -29,7 +29,7 @@ void MergeNode::run(ExecutionNode* previous)
{
if(nullptr == previous)
{
- m_errors.insert(ExecutionNode::NO_PREVIOUS_ERROR, QObject::tr("No previous node before Merge operator"));
+ m_errors.insert(Dice::ERROR_CODE::NO_PREVIOUS_ERROR, QObject::tr("No previous node before Merge operator"));
return;
}
@@ -69,7 +69,7 @@ void MergeNode::run(ExecutionNode* previous)
}
}
auto it= std::find_if(pastResult.begin(), pastResult.end(),
- [tmpResult](const Result* a) { return (a == tmpResult->getPrevious()); });
+ [tmpResult](const Result* a) { return (a == tmpResult->getPrevious()); });
if(it == pastResult.end())
{
pastResult.push_back(previousLast->getResult());