1 files changed, 20 insertions, 20 deletions

diff --git a/src/server/Task.cpp b/src/server/Task.cpp
index c76c19ae..dd09e060 100644
--- a/src/server/Task.cpp
+++ b/src/server/Task.cpp
@@ -29,14 +29,14 @@ Task::run(RunContext& context)
 		_block->process(context);
 		break;
 	case Mode::SEQUENTIAL:
-		for (auto& task : _children) {
-			task.run(context);
+		for (const auto& task : _children) {
+			task->run(context);
 		}
 		break;
 	case Mode::PARALLEL:
 		// Initialize (not) done state of sub-tasks
-		for (auto& task : _children) {
-			task.set_done(false);
+		for (const auto& task : _children) {
+			task->set_done(false);
 		}
 
 		// Grab the first sub-task
@@ -64,7 +64,7 @@ Task::steal(RunContext& context)
 	if (_mode == Mode::PARALLEL) {
 		const unsigned i = _next++;
 		if (i < _children.size()) {
-			return &_children[i];
+			return _children[i].get();
 		}
 	}
 
@@ -82,7 +82,7 @@ Task::get_task(RunContext& context)
 
 	while (true) {
 		// Push done end index as forward as possible
-		while (_done_end < _children.size() && _children[_done_end].done()) {
+		while (_done_end < _children.size() && _children[_done_end]->done()) {
 			++_done_end;
 		}
 
@@ -103,31 +103,31 @@ Task::get_task(RunContext& context)
 	}
 }
 
-Task
-Task::simplify(Task task)
+std::unique_ptr<Task>
+Task::simplify(std::unique_ptr<Task>&& task)
 {
-	if (task.mode() == Mode::SINGLE) {
-		return task;
+	if (task->mode() == Mode::SINGLE) {
+		return std::move(task);
 	}
 
-	Task ret(task.mode());
-	for (auto&& c : task._children) {
+	std::unique_ptr<Task> ret = std::make_unique<Task>(task->mode());
+	for (auto&& c : task->_children) {
 		auto child = simplify(std::move(c));
-		if (!child.empty()) {
-			if (child.mode() == task.mode()) {
+		if (!child->empty()) {
+			if (child->mode() == task->mode()) {
 				// Merge child into parent
-				for (auto&& grandchild : child._children) {
-					ret.append(std::move(grandchild));
+				for (auto&& grandchild : child->_children) {
+					ret->append(std::move(grandchild));
 				}
 			} else {
 				// Add child task
-				ret.append(std::move(child));
+				ret->append(std::move(child));
 			}
 		}
 	}
 
-	if (ret._children.size() == 1) {
-		return std::move(ret._children.front());
+	if (ret->_children.size() == 1) {
+		return std::move(ret->_children.front());
 	}
 
 	return ret;
@@ -148,7 +148,7 @@ Task::dump(std::function<void (const std::string&)> sink, unsigned indent, bool
 	} else {
 		sink(((_mode == Mode::SEQUENTIAL) ? "(seq " : "(par "));
 		for (size_t i = 0; i < _children.size(); ++i) {
-			_children[i].dump(sink, indent + 5, i == 0);
+			_children[i]->dump(sink, indent + 5, i == 0);
 		}
 		sink(")");
 	}