summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Parser.cpp6
-rw-r--r--src/server/LV2Block.cpp2
-rw-r--r--wscript1
3 files changed, 4 insertions, 5 deletions
diff --git a/src/Parser.cpp b/src/Parser.cpp
index 55ab4695..0f5adb0c 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -384,7 +384,7 @@ parse_graph(ingen::World& world,
}
if (ctx != Resource::Graph::INTERNAL) {
- return graph_path; // Not parsing graph internals, finished now
+ return {graph_path}; // Not parsing graph internals, finished now
}
// For each block in this graph
@@ -428,7 +428,7 @@ parse_graph(ingen::World& world,
// Now that all ports and blocks exist, create arcs inside graph
parse_arcs(world, target, model, base_uri, subject, graph_path);
- return graph_path;
+ return {graph_path};
}
static bool
@@ -697,7 +697,7 @@ Parser::parse_string(ingen::World& world,
Sord::Node subject;
parse(world, target, model, actual_base, subject, parent, symbol, data);
- return actual_base;
+ return {actual_base};
}
} // namespace ingen
diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp
index bc6561d3..15c66a2c 100644
--- a/src/server/LV2Block.cpp
+++ b/src/server/LV2Block.cpp
@@ -730,7 +730,7 @@ LV2Block::save_preset(const URI& uri,
lilv_world_load_bundle(lworld, lbundle);
lilv_node_free(lbundle);
- return preset;
+ return {preset};
}
return boost::optional<Resource>();
diff --git a/wscript b/wscript
index c6078bda..884bc7ec 100644
--- a/wscript
+++ b/wscript
@@ -77,7 +77,6 @@ def configure(conf):
'-Wno-implicit-int-conversion',
'-Wno-padded',
'-Wno-reserved-id-macro',
- '-Wno-return-std-move-in-c++11',
'-Wno-shadow',
'-Wno-shadow-field',
'-Wno-shadow-field-in-constructor',