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.

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

Fixing hpx::wait_all() invoked with two vector<future<T>> #1637

Merged
merged 3 commits into from Jul 4, 2015

Conversation

Projects
None yet
2 participants
@hkaiser
Copy link
Member

commented Jun 29, 2015

This fixes #1623

future<result_type>
>::type shared_state_ptr;

shared_state_ptr const& state = lcos::detail::get_shared_state(f);
shared_state_ptr const& state = traits::get_shared_state(f);

This comment has been minimized.

Copy link
@sithhell

sithhell Jul 1, 2015

Member

This looks odd. The trait is defined in hpx::traits but the returned type is defined in hpx::traits::detail.

This comment has been minimized.

Copy link
@hkaiser

hkaiser Jul 2, 2015

Author Member

Good point, everything belongs into traits::detail.

future<result_type>
>::type shared_state_ptr;

shared_state_ptr const& state = lcos::detail::get_shared_state(f);
shared_state_ptr const& state = traits::get_shared_state(f);

This comment has been minimized.

Copy link
@sithhell

sithhell Jul 1, 2015

Member

Same here.

typename util::always_void<
typename lcos::detail::future_iterator_traits<Iterator>::type
>::type
typename lcos::detail::future_iterator_traits<Iterator>::type

This comment has been minimized.

Copy link
@sithhell

sithhell Jul 2, 2015

Member

This is changing the functions return type, is this intended?

This comment has been minimized.

Copy link
@hkaiser

hkaiser Jul 2, 2015

Author Member

Definitely not intended, excellent catch!

typename util::always_void<
typename lcos::detail::future_iterator_traits<Iterator>::type
>::type
typename lcos::detail::future_iterator_traits<Iterator>::type

This comment has been minimized.

Copy link
@sithhell

sithhell Jul 2, 2015

Member

This is changing the functions return type, is this intended?

typename util::always_void<
typename lcos::detail::future_iterator_traits<Iterator>::type
>::type wait_some(std::size_t n, Iterator begin, Iterator end,
typename lcos::detail::future_iterator_traits<Iterator>::type

This comment has been minimized.

Copy link
@sithhell

sithhell Jul 2, 2015

Member

This is changing the functions return type, is this intended?

hkaiser added some commits Jul 2, 2015

Addressing review comments:
- Fixing return types for wait_all etc.
- Moving get_shared_state into namespace hpx::traits::detail

@hkaiser hkaiser force-pushed the fixing_1623 branch from 8c9d9b2 to e5e3485 Jul 3, 2015

hkaiser added a commit that referenced this pull request Jul 4, 2015

Merge pull request #1637 from STEllAR-GROUP/fixing_1623
Fixing hpx::wait_all() invoked with two vector<future<T>>

@hkaiser hkaiser merged commit f4fe0cc into master Jul 4, 2015

1 check passed

ci/circleci Your tests passed on CircleCI!
Details

@hkaiser hkaiser deleted the fixing_1623 branch Jul 4, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.