Skip to content

Commit

Permalink
Merge pull request #411 from STEllAR-GROUP/fix-compilation-with-hpx-m…
Browse files Browse the repository at this point in the history
…aster

Switch to id_type::management_type::unmanaged
  • Loading branch information
G-071 committed Apr 8, 2022
2 parents c408fbc + 66ddafe commit 640907a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion octotiger/node_client.hpp
Expand Up @@ -52,7 +52,7 @@ class node_client
arc& id;
if (!empty())
{
unmanaged = hpx::id_type(id.get_gid(), hpx::id_type::unmanaged);
unmanaged = hpx::id_type(id.get_gid(), hpx::id_type::management_type::unmanaged);
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/node_client.cpp
Expand Up @@ -28,7 +28,7 @@ hpx::id_type node_client::get_unmanaged_gid() const {
node_client& node_client::operator=(hpx::future<hpx::id_type>&& fut) {
id = fut.get();
if( !empty() ) {
unmanaged = hpx::id_type(id.get_gid(), hpx::id_type::unmanaged);
unmanaged = hpx::id_type(id.get_gid(), hpx::id_type::management_type::unmanaged);
local = hpx::naming::get_locality_from_id(id) == hpx::find_here();
// local = bool(hpx::get_colocation_id(id).get() == hpx::find_here());
}
Expand All @@ -38,7 +38,7 @@ node_client& node_client::operator=(hpx::future<hpx::id_type>&& fut) {
node_client& node_client::operator=(const hpx::id_type& _id) {
id = _id;
if (!empty()) {
unmanaged = hpx::id_type(id.get_gid(), hpx::id_type::unmanaged);
unmanaged = hpx::id_type(id.get_gid(), hpx::id_type::management_type::unmanaged);
local = hpx::naming::get_locality_from_id(id) == hpx::find_here();
// local = bool(hpx::get_colocation_id(id).get() == hpx::find_here());
}
Expand All @@ -48,7 +48,7 @@ node_client& node_client::operator=(const hpx::id_type& _id) {
node_client::node_client(hpx::future<hpx::id_type>&& fut) {
id = fut.get();
if( !empty() ) {
unmanaged = hpx::id_type(id.get_gid(), hpx::id_type::unmanaged);
unmanaged = hpx::id_type(id.get_gid(), hpx::id_type::management_type::unmanaged);
local = hpx::naming::get_locality_from_id(id) == hpx::find_here();
// local = bool(hpx::get_colocation_id(id).get() == hpx::find_here());
}
Expand All @@ -57,7 +57,7 @@ node_client::node_client(hpx::future<hpx::id_type>&& fut) {
node_client::node_client(const hpx::id_type& _id) {
id = _id;
if (!empty()) {
unmanaged = hpx::id_type(id.get_gid(), hpx::id_type::unmanaged);
unmanaged = hpx::id_type(id.get_gid(), hpx::id_type::management_type::unmanaged);
local = hpx::naming::get_locality_from_id(id) == hpx::find_here();
}
}
Expand Down

0 comments on commit 640907a

Please sign in to comment.