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

Fix some uses of begin/end, remove unnecessary includes #2764

Merged
merged 1 commit into from Jul 19, 2017
Merged

Fix some uses of begin/end, remove unnecessary includes #2764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 7 additions & 6 deletions hpx/parallel/algorithms/reduce_by_key.hpp
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@
#include <hpx/parallel/algorithms/inclusive_scan.hpp>
#include <hpx/parallel/algorithms/sort.hpp>
#include <hpx/parallel/util/zip_iterator.hpp>
#include <hpx/util/range.hpp>
#include <hpx/util/transform_iterator.hpp>
#include <hpx/util/tuple.hpp>
//
Expand Down Expand Up @@ -346,11 +347,11 @@ namespace hpx { namespace parallel { inline namespace v1
typedef typename std::iterator_traits<RanIter2>::value_type value_type;

zip_iterator_in states_begin = make_zip_iterator(values_first,
std::begin(key_state));
hpx::util::begin(key_state));
zip_iterator_in states_end = make_zip_iterator(
values_first + number_of_keys, std::end(key_state));
values_first + number_of_keys, hpx::util::end(key_state));
zip_iterator_vout states_out_begin = make_zip_iterator(values_output,
std::begin(key_state));
hpx::util::begin(key_state));
//

zip_type_in initial;
Expand Down Expand Up @@ -398,11 +399,11 @@ namespace hpx { namespace parallel { inline namespace v1
return make_pair_result(
hpx::parallel::copy_if(sync_policy,
make_zip_iterator(key_first, values_output,
std::begin(key_state)),
hpx::util::begin(key_state)),
make_zip_iterator(key_last, values_output + number_of_keys,
std::end(key_state)),
hpx::util::end(key_state)),
make_zip_iterator(keys_output, values_output,
std::begin(key_state)),
hpx::util::begin(key_state)),
// copies to dest only when 'end' state is true
[](zip2_ref it)
{
Expand Down
4 changes: 1 addition & 3 deletions hpx/parallel/container_algorithms/partition.hpp
View file
Open in desktop
Expand Up @@ -20,8 +20,6 @@
#include <hpx/parallel/traits/projected.hpp>
#include <hpx/parallel/traits/projected_range.hpp>

#include <boost/range/functions.hpp>

#include <type_traits>
#include <utility>

Expand Down Expand Up @@ -131,7 +129,7 @@ namespace hpx { namespace parallel { inline namespace v1
Proj && proj = Proj())
{
return partition_copy(std::forward<ExPolicy>(policy),
std::begin(rng), std::end(rng), dest_true, dest_false,
hpx::util::begin(rng), hpx::util::end(rng), dest_true, dest_false,
std::forward<Pred>(pred),
std::forward<Proj>(proj));
}
Expand Down
4 changes: 1 addition & 3 deletions hpx/parallel/container_algorithms/unique.hpp
View file
Open in desktop
Expand Up @@ -20,8 +20,6 @@
#include <hpx/parallel/traits/projected.hpp>
#include <hpx/parallel/traits/projected_range.hpp>

#include <boost/range/functions.hpp>

#include <type_traits>
#include <utility>

Expand Down Expand Up @@ -124,7 +122,7 @@ namespace hpx { namespace parallel { inline namespace v1
Proj && proj = Proj())
{
return unique_copy(std::forward<ExPolicy>(policy),
std::begin(rng), std::end(rng), dest,
hpx::util::begin(rng), hpx::util::end(rng), dest,
std::forward<Pred>(pred),
std::forward<Proj>(proj));
}
Expand Down
1 change: 0 additions & 1 deletion tests/unit/parallel/algorithms/destroy_tests.hpp
View file
Open in desktop
Expand Up @@ -13,7 +13,6 @@
#include <hpx/util/lightweight_test.hpp>

#include <boost/atomic.hpp>
#include <boost/range/functions.hpp>

#include <cstddef>
#include <cstdint>
Expand Down
1 change: 0 additions & 1 deletion tests/unit/parallel/algorithms/destroyn.cpp
View file
Open in desktop
Expand Up @@ -9,7 +9,6 @@
#include <hpx/util/lightweight_test.hpp>

#include <boost/atomic.hpp>
#include <boost/range/functions.hpp>

#include <cstddef>
#include <cstdint>
Expand Down
1 change: 0 additions & 1 deletion tests/unit/parallel/algorithms/uninitialized_default_construct_tests.hpp
View file
Open in desktop
Expand Up @@ -13,7 +13,6 @@
#include <hpx/util/lightweight_test.hpp>

#include <boost/atomic.hpp>
#include <boost/range/functions.hpp>

#include <cstddef>
#include <cstdint>
Expand Down
1 change: 0 additions & 1 deletion tests/unit/parallel/algorithms/uninitialized_default_constructn.cpp
View file
Open in desktop
Expand Up @@ -9,7 +9,6 @@
#include <hpx/util/lightweight_test.hpp>

#include <boost/atomic.hpp>
#include <boost/range/functions.hpp>

#include <cstddef>
#include <cstdint>
Expand Down
1 change: 0 additions & 1 deletion tests/unit/parallel/algorithms/uninitialized_value_construct_tests.hpp
View file
Open in desktop
Expand Up @@ -13,7 +13,6 @@
#include <hpx/util/lightweight_test.hpp>

#include <boost/atomic.hpp>
#include <boost/range/functions.hpp>

#include <cstddef>
#include <cstring>
Expand Down
1 change: 0 additions & 1 deletion tests/unit/parallel/algorithms/uninitialized_value_constructn.cpp
View file
Open in desktop
Expand Up @@ -9,7 +9,6 @@
#include <hpx/util/lightweight_test.hpp>

#include <boost/atomic.hpp>
#include <boost/range/functions.hpp>

#include <cstddef>
#include <cstring>
Expand Down