From b760e11d5f9f4d25919a566ef727164da4376062 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 4 Jun 2021 19:19:58 -0400 Subject: Switch to C++14 and fix build with GCC 10 GCC was having problems with this make_unique overload, but I don't care about C++11 compatibility at this point anyway, so it's easiest to just remove it. --- src/server/events/Delta.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/server/events/Delta.cpp') diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp index 034b2194..b4d46fb9 100644 --- a/src/server/events/Delta.cpp +++ b/src/server/events/Delta.cpp @@ -43,7 +43,6 @@ #include "ingen/Store.hpp" #include "ingen/URIs.hpp" #include "ingen/World.hpp" -#include "ingen/memory.hpp" #include "ingen/paths.hpp" #include "lilv/lilv.h" #include "raul/Maid.hpp" @@ -153,7 +152,7 @@ Delta::add_set_event(const char* port_symbol, } _set_events.emplace_back( - make_unique( + std::make_unique( _engine, _request_client, _request_id, _time, port, Atom(size, type, value), false, true)); } @@ -249,13 +248,13 @@ Delta::pre_process(PreProcessContext& ctx) ingen::Resource::type(uris, _properties, is_graph, is_block, is_port, is_output); if (is_graph) { - _create_event = make_unique( + _create_event = std::make_unique( _engine, _request_client, _request_id, _time, path, _properties); } else if (is_block) { - _create_event = make_unique( + _create_event = std::make_unique( _engine, _request_client, _request_id, _time, path, _properties); } else if (is_port) { - _create_event = make_unique( + _create_event = std::make_unique( _engine, _request_client, _request_id, _time, path, _properties); } @@ -351,7 +350,7 @@ Delta::pre_process(PreProcessContext& ctx) } } else if (key == uris.ingen_value || key == uris.ingen_activity) { _set_events.emplace_back( - make_unique( + std::make_unique( _engine, _request_client, _request_id, _time, port, value, key == uris.ingen_activity)); } else if (key == uris.midi_binding) { -- cgit v1.2.1