diff options
author | David Robillard <d@drobilla.net> | 2021-06-04 19:19:58 -0400 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2021-06-04 19:19:58 -0400 |
commit | b760e11d5f9f4d25919a566ef727164da4376062 (patch) | |
tree | 6ade88a43041b62b03247bb73b73a481c7931053 /src/server/Engine.cpp | |
parent | fef4ce2b39b1a00609122fe37e2378be2fa9319f (diff) | |
download | ingen-b760e11d5f9f4d25919a566ef727164da4376062.tar.gz ingen-b760e11d5f9f4d25919a566ef727164da4376062.tar.bz2 ingen-b760e11d5f9f4d25919a566ef727164da4376062.zip |
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.
Diffstat (limited to 'src/server/Engine.cpp')
-rw-r--r-- | src/server/Engine.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp index c72d98df..b48b291f 100644 --- a/src/server/Engine.cpp +++ b/src/server/Engine.cpp @@ -58,7 +58,6 @@ #include "ingen/URI.hpp" #include "ingen/URIs.hpp" #include "ingen/World.hpp" -#include "ingen/memory.hpp" #include "lv2/buf-size/buf-size.h" #include "lv2/state/state.h" #include "raul/Maid.hpp" @@ -114,9 +113,9 @@ Engine::Engine(ingen::World& world) for (int i = 0; i < world.conf().option("threads").get<int32_t>(); ++i) { _notifications.emplace_back( - make_unique<raul::RingBuffer>(uint32_t(24 * event_queue_size()))); + std::make_unique<raul::RingBuffer>(uint32_t(24 * event_queue_size()))); _run_contexts.emplace_back( - make_unique<RunContext>( + std::make_unique<RunContext>( *this, _notifications.back().get(), unsigned(i), i > 0)); } @@ -189,7 +188,7 @@ void Engine::listen() { #ifdef HAVE_SOCKET - _listener = make_unique<SocketListener>(*this); + _listener = std::make_unique<SocketListener>(*this); #endif } |