From 31741a37daf905059fea5fbb38b3af3f4da2ce39 Mon Sep 17 00:00:00 2001
From: Arkadiusz Szczepkowicz <arek.szczepkowicz@ng-analytics.com>
Date: Tue, 19 Mar 2024 14:12:11 +0100
Subject: [PATCH] #2063: Update void* to std::byte* in DispatchCollection

---
 .../callback/proxy_bcast/callback_proxy_bcast_tl.impl.h   | 2 +-
 src/vt/vrt/collection/dispatch/dispatch.h                 | 8 ++++----
 src/vt/vrt/collection/dispatch/dispatch.impl.h            | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/vt/pipe/callback/proxy_bcast/callback_proxy_bcast_tl.impl.h b/src/vt/pipe/callback/proxy_bcast/callback_proxy_bcast_tl.impl.h
index f4a939693d..4d30b5eb35 100644
--- a/src/vt/pipe/callback/proxy_bcast/callback_proxy_bcast_tl.impl.h
+++ b/src/vt/pipe/callback/proxy_bcast/callback_proxy_bcast_tl.impl.h
@@ -106,7 +106,7 @@ void CallbackProxyBcastDirect::trigger(MsgT* msg, PipeType const& pipe) {
 
   auto dispatcher = vrt::collection::getDispatcher(vrt_dispatch_han_);
   auto const& proxy = proxy_;
-  dispatcher->broadcast(proxy, msg, handler_);
+  dispatcher->broadcast(proxy, reinterpret_cast<std::byte*>(msg), handler_);
 }
 
 }}} /* end namespace vt::pipe::callback */
diff --git a/src/vt/vrt/collection/dispatch/dispatch.h b/src/vt/vrt/collection/dispatch/dispatch.h
index 6ceba3c7e6..4ba527204d 100644
--- a/src/vt/vrt/collection/dispatch/dispatch.h
+++ b/src/vt/vrt/collection/dispatch/dispatch.h
@@ -61,9 +61,9 @@ struct DispatchCollectionBase {
   virtual ~DispatchCollectionBase() {}
 
   virtual void
-  broadcast(VirtualProxyType proxy, void* msg, HandlerType han) = 0;
+  broadcast(VirtualProxyType proxy, std::byte* msg, HandlerType han) = 0;
   virtual void
-  send(VirtualProxyType proxy, void* idx, void* msg, HandlerType han) = 0;
+  send(VirtualProxyType proxy, std::byte* idx, std::byte* msg, HandlerType han) = 0;
 
   template <typename=void>
   VirtualProxyType getDefaultProxy() const;
@@ -83,9 +83,9 @@ struct DispatchCollectionBase {
 template <typename ColT, typename MsgT>
 struct DispatchCollection final : DispatchCollectionBase {
 private:
-  void broadcast(VirtualProxyType proxy, void* msg, HandlerType han) override;
+  void broadcast(VirtualProxyType proxy, std::byte* msg, HandlerType han) override;
   void send(
-    VirtualProxyType proxy, void* idx, void* msg, HandlerType han
+    VirtualProxyType proxy, std::byte* idx, std::byte* msg, HandlerType han
   ) override;
 };
 
diff --git a/src/vt/vrt/collection/dispatch/dispatch.impl.h b/src/vt/vrt/collection/dispatch/dispatch.impl.h
index a794e84ccc..03efe0e806 100644
--- a/src/vt/vrt/collection/dispatch/dispatch.impl.h
+++ b/src/vt/vrt/collection/dispatch/dispatch.impl.h
@@ -56,7 +56,7 @@ namespace vt { namespace vrt { namespace collection {
 
 template <typename ColT, typename MsgT>
 void DispatchCollection<ColT, MsgT>::broadcast(
-  VirtualProxyType proxy, void* msg, HandlerType han
+  VirtualProxyType proxy, std::byte* msg, HandlerType han
 ) {
   using IdxT = typename ColT::IndexType;
   auto const msg_typed = reinterpret_cast<MsgT*>(msg);
@@ -68,7 +68,7 @@ void DispatchCollection<ColT, MsgT>::broadcast(
 
 template <typename ColT, typename MsgT>
 void DispatchCollection<ColT, MsgT>::send(
-  VirtualProxyType proxy, void* idx, void* msg, HandlerType han
+  VirtualProxyType proxy, std::byte* idx, std::byte* msg, HandlerType han
 ) {
   using IdxT = typename ColT::IndexType;
   auto const msg_typed = reinterpret_cast<MsgT*>(msg);