From 9f2defca9fde94173384555dd941235845e222e8 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Tue, 19 Mar 2024 16:32:25 +0100 Subject: [PATCH] #2063: Update void* to std::byte* --- src/vt/messaging/active.cc | 6 +++--- src/vt/pipe/callback/cb_union/cb_raw_base.h | 4 ++-- src/vt/vrt/collection/balance/greedylb/greedylb.cc | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vt/messaging/active.cc b/src/vt/messaging/active.cc index 0215cc4a25..4ac14777d3 100644 --- a/src/vt/messaging/active.cc +++ b/src/vt/messaging/active.cc @@ -255,16 +255,16 @@ EventType ActiveMessenger::sendMsgBytesWithPut( verbose, active, "sendMsgBytesWithPut: (put) put_ptr={}, size:[msg={},put={},rem={}]," "dest={}, max_pack_size={}, direct_buf_pack={}\n", - put_ptr, base.size(), put_size, rem_size, dest, max_pack_direct_size, + print_ptr(put_ptr), base.size(), put_size, rem_size, dest, max_pack_direct_size, print_bool(direct_buf_pack) ); } if (direct_buf_pack) { - new_msg_size = packMsg(msg, base.size(), reinterpret_cast(put_ptr), put_size); + new_msg_size = packMsg(msg, base.size(), put_ptr, put_size); } else { auto const& env_tag = envelopeGetPutTag(msg->env); auto const& ret = sendData( - PtrLenPairType{reinterpret_cast(put_ptr),put_size}, dest, env_tag + PtrLenPairType{put_ptr,put_size}, dest, env_tag ); auto const& ret_tag = ret.getTag(); if (ret_tag != env_tag) { diff --git a/src/vt/pipe/callback/cb_union/cb_raw_base.h b/src/vt/pipe/callback/cb_union/cb_raw_base.h index b0a337453d..05be09b89d 100644 --- a/src/vt/pipe/callback/cb_union/cb_raw_base.h +++ b/src/vt/pipe/callback/cb_union/cb_raw_base.h @@ -103,7 +103,7 @@ struct CallbackRawBaseSingle { CallbackRawBaseSingle( RawSendColDirTagType, PipeType const& in_pipe, HandlerType const in_handler, AutoHandlerType const in_vrt_handler, - void* index_bits + std::byte* index_bits ); CallbackRawBaseSingle( RawBcastObjGrpTagType, PipeType in_pipe, HandlerType in_handler, @@ -198,7 +198,7 @@ struct CallbackTyped : CallbackRawBaseSingle { CallbackTyped( RawSendColDirTagType, PipeType const& in_pipe, HandlerType const in_handler, AutoHandlerType const in_vrt_handler, - void* index_bits + std::byte* index_bits ) : CallbackRawBaseSingle( RawSendColDirTag,in_pipe,in_handler,in_vrt_handler,index_bits ) diff --git a/src/vt/vrt/collection/balance/greedylb/greedylb.cc b/src/vt/vrt/collection/balance/greedylb/greedylb.cc index a53d11b949..c82b6f818b 100644 --- a/src/vt/vrt/collection/balance/greedylb/greedylb.cc +++ b/src/vt/vrt/collection/balance/greedylb/greedylb.cc @@ -363,7 +363,7 @@ void GreedyLB::transferObjs(std::vector&& in_load) { max_recs, max_bytes ); theCollective()->scatter( - max_bytes*load.size(),max_bytes,nullptr,[&](NodeType node, void* ptr){ + max_bytes*load.size(),max_bytes,nullptr,[&](NodeType node, std::byte* ptr){ auto ptr_out = reinterpret_cast(ptr); auto const& proc = node_transfer[node]; auto const& rec_size = proc.size();