summaryrefslogtreecommitdiff
path: root/libs/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour')
-rw-r--r--libs/ardour/ardour/io.h2
-rw-r--r--libs/ardour/io.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index 2451611b1b..1ba27a7449 100644
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -152,7 +152,7 @@ class IO : public SessionObject, public Latent
typedef bool result_type;
template <typename Iter>
- bool operator() (Iter first, Iter last) const {
+ result_type operator() (Iter first, Iter last) const {
bool r = false;
while (first != last) {
if (*first) {
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index a278852e77..26432c66ef 100644
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -256,8 +256,8 @@ IO::remove_port (boost::shared_ptr<Port> port, void* src)
ChanCount after = before;
after.set (port->type(), after.get (port->type()) - 1);
- bool const r = PortCountChanging (after); /* EMIT SIGNAL */
- if (r) {
+ boost::optional<bool> const r = PortCountChanging (after); /* EMIT SIGNAL */
+ if (r.get_value_or (false)) {
return -1;
}