summaryrefslogtreecommitdiffstats
path: root/src/server/events
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2022-12-13 01:19:10 -0500
committerDavid Robillard <d@drobilla.net>2022-12-14 18:04:27 -0500
commitfa611574101cd657a0716aaf2028b5bc852d4a8a (patch)
tree7fce4411abeaa06a5eb33ebcb13c317743d4cada /src/server/events
parent4b56cdf7a925dafd5e4ac085874d2afe294ec456 (diff)
downloadingen-fa611574101cd657a0716aaf2028b5bc852d4a8a.tar.gz
ingen-fa611574101cd657a0716aaf2028b5bc852d4a8a.tar.bz2
ingen-fa611574101cd657a0716aaf2028b5bc852d4a8a.zip
Use std::optional
Diffstat (limited to 'src/server/events')
-rw-r--r--src/server/events/Copy.cpp11
-rw-r--r--src/server/events/CreatePort.hpp5
-rw-r--r--src/server/events/Delta.hpp5
3 files changed, 9 insertions, 12 deletions
diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp
index 06a71fdc..c62417e0 100644
--- a/src/server/events/Copy.cpp
+++ b/src/server/events/Copy.cpp
@@ -34,11 +34,10 @@
#include "raul/Path.hpp"
#include "raul/Symbol.hpp"
-#include <boost/optional/optional.hpp>
-
#include <map>
#include <memory>
#include <mutex>
+#include <optional>
#include <string>
#include <string_view>
#include <utility>
@@ -190,10 +189,10 @@ Copy::filesystem_to_engine(PreProcessContext&)
std::lock_guard<std::mutex> lock(_engine.world().rdf_mutex());
// Old URI is a filesystem path and new URI is a path within the engine
- const std::string src_path(_msg.old_uri.path());
- const raul::Path dst_path = uri_to_path(_msg.new_uri);
- boost::optional<raul::Path> dst_parent;
- boost::optional<raul::Symbol> dst_symbol;
+ const std::string src_path(_msg.old_uri.path());
+ const raul::Path dst_path = uri_to_path(_msg.new_uri);
+ std::optional<raul::Path> dst_parent;
+ std::optional<raul::Symbol> dst_symbol;
if (!dst_path.is_root()) {
dst_parent = dst_path.parent();
dst_symbol = raul::Symbol(dst_path.symbol());
diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp
index 3351adc9..6d3e9ca2 100644
--- a/src/server/events/CreatePort.hpp
+++ b/src/server/events/CreatePort.hpp
@@ -27,10 +27,9 @@
#include "raul/Maid.hpp"
#include "raul/Path.hpp"
-#include <boost/optional/optional.hpp>
-
#include <cstdint>
#include <memory>
+#include <optional>
namespace ingen {
@@ -81,7 +80,7 @@ private:
EnginePort* _engine_port{nullptr}; ///< Driver port if on the root
Properties _properties;
Properties _update;
- boost::optional<Flow> _flow;
+ std::optional<Flow> _flow;
};
} // namespace events
diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp
index 7f79ae94..35357a26 100644
--- a/src/server/events/Delta.hpp
+++ b/src/server/events/Delta.hpp
@@ -29,10 +29,9 @@
#include "ingen/URI.hpp"
#include "raul/Maid.hpp"
-#include <boost/optional/optional.hpp>
-
#include <cstdint>
#include <memory>
+#include <optional>
#include <vector>
// IWYU pragma: no_include <algorithm>
@@ -129,7 +128,7 @@ private:
std::vector<ControlBindings::Binding*> _removed_bindings;
- boost::optional<Resource> _preset;
+ std::optional<Resource> _preset;
bool _block{false};
};