summaryrefslogtreecommitdiff
path: root/modules/async/c++
diff options
context:
space:
mode:
Diffstat (limited to 'modules/async/c++')
-rw-r--r--modules/async/c++/async.tmpl.hpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/modules/async/c++/async.tmpl.hpp b/modules/async/c++/async.tmpl.hpp
index ec8d3fc..68489ad 100644
--- a/modules/async/c++/async.tmpl.hpp
+++ b/modules/async/c++/async.tmpl.hpp
@@ -162,8 +162,7 @@ own<conveyor_node> conveyor<T>::from_conveyor(conveyor<T> conveyor) {
template <typename T> error_or<fix_void<T>> conveyor<T>::take() {
SAW_ASSERT(node_) {
- return error_or<fix_void<T>>{
- make_error<err::invalid_state>("conveyor in invalid state")};
+ make_error<err::invalid_state>("conveyor in invalid state");
}
conveyor_storage *storage = node_->next_storage();
if (storage) {
@@ -172,12 +171,10 @@ template <typename T> error_or<fix_void<T>> conveyor<T>::take() {
node_->get_result(result);
return result;
} else {
- return error_or<fix_void<T>>{
- make_error<err::buffer_exhausted>("conveyor buffer has no elements")};
+ return make_error<err::buffer_exhausted>("conveyor buffer has no elements");
}
} else {
- return error_or<fix_void<T>>{
- make_error<err::invalid_state>("conveyor node has no child storage")};
+ return make_error<err::invalid_state>("conveyor node has no child storage");
}
}