Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Master fixes #3022

Merged
merged 2 commits into from
Nov 24, 2017
Merged

Master fixes #3022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6a21ea
Adding default move assignment for promise_lco keep_alive
sithhell Nov 22, 2017
9d4b4f5
Fixing typo in hpx::util::optional<T> operator>
sithhell Nov 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions hpx/lcos/detail/promise_base.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,8 @@ namespace lcos {
: ptr_(o.ptr_.release(), &wrapping_deleter)
{}

keep_alive& operator=(keep_alive&& o) = default;

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add a default copy assignment operator as well?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. This thing is obviously not copyable

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, that's not really obvious to me. If the intention is to inhibit copying, add a =delete for the corresponding functions.

void operator()()
{
delete ptr_->get(); // delete wrapped_type
Expand Down
2 changes: 1 addition & 1 deletion hpx/util/optional.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ namespace hpx { namespace util
template <typename T>
constexpr bool operator>(optional<T> const& lhs, optional<T> const& rhs)
{
return (!bool(rhs)) ? false : (!bool(lhs)) ? true : *rhs > *lhs;
return (!bool(lhs)) ? false : (!bool(rhs)) ? true : *rhs > *lhs;
}

template <typename T>
Expand Down