From 34fb90e18a20cfc780cdef660e6da391baf1bcde Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 16 Jan 2018 21:21:20 +0100 Subject: Fix build with C++11 --- ingen/Interface.hpp | 2 ++ src/server/CompiledGraph.cpp | 2 +- src/server/Task.cpp | 2 +- src/server/Task.hpp | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ingen/Interface.hpp b/ingen/Interface.hpp index e22add9a..2221f8f0 100644 --- a/ingen/Interface.hpp +++ b/ingen/Interface.hpp @@ -47,6 +47,8 @@ class Atom; class INGEN_API Interface { public: + using result_type = void; + Interface() : _seq(0) {} virtual ~Interface() = default; diff --git a/src/server/CompiledGraph.cpp b/src/server/CompiledGraph.cpp index 6002afa1..e8eed012 100644 --- a/src/server/CompiledGraph.cpp +++ b/src/server/CompiledGraph.cpp @@ -53,7 +53,7 @@ has_provider_with_many_dependants(BlockImpl* n) } CompiledGraph::CompiledGraph(GraphImpl* graph) - : _master(std::make_unique(Task::Mode::SEQUENTIAL)) + : _master(std::unique_ptr(new Task(Task::Mode::SEQUENTIAL))) { compile_graph(graph); } diff --git a/src/server/Task.cpp b/src/server/Task.cpp index dd09e060..d2cb2683 100644 --- a/src/server/Task.cpp +++ b/src/server/Task.cpp @@ -110,7 +110,7 @@ Task::simplify(std::unique_ptr&& task) return std::move(task); } - std::unique_ptr ret = std::make_unique(task->mode()); + std::unique_ptr ret = std::unique_ptr(new Task(task->mode())); for (auto&& c : task->_children) { auto child = simplify(std::move(c)); if (!child->empty()) { diff --git a/src/server/Task.hpp b/src/server/Task.hpp index 3bcfbb40..2cdad71b 100644 --- a/src/server/Task.hpp +++ b/src/server/Task.hpp @@ -85,7 +85,7 @@ public: /** Prepend a child to this task. */ void push_front(Task&& task) { - _children.emplace_front(std::make_unique(std::move(task))); + _children.emplace_front(std::unique_ptr(new Task(std::move(task)))); } Mode mode() const { return _mode; } -- cgit v1.2.1