Skip to content

Commit 8d5b2a8

Browse files
committed
#2063: Update void* to std::byte* in Holder struct
1 parent baa338a commit 8d5b2a8

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

src/vt/objgroup/holder/holder.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ struct Holder final : HolderObjBase<ObjT> {
6363
public:
6464
ObjT* get() override { return obj_.get(); }
6565
bool exists() override { return obj_ != nullptr; }
66-
void* getPtr() override { return obj_.get(); }
66+
std::byte* getPtr() override { return reinterpret_cast<std::byte*>(obj_.get()); }
6767

6868
template <typename... Args>
6969
void reset(Args&&... args) {

src/vt/objgroup/holder/holder_base.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ struct HolderBase {
5757

5858
virtual ~HolderBase() = default;
5959
virtual bool exists() = 0;
60-
virtual void* getPtr() = 0;
60+
virtual std::byte* getPtr() = 0;
6161

6262
template <typename Serializer>
6363
void serialize(Serializer& s) {
@@ -78,7 +78,7 @@ template <typename ObjT>
7878
struct HolderObjBase : HolderBase {
7979
virtual ~HolderObjBase() = default;
8080
virtual ObjT* get() = 0;
81-
virtual void* getPtr() = 0;
81+
virtual std::byte* getPtr() = 0;
8282
};
8383

8484
}}} /* end namespace vt::objgroup::holder */

src/vt/objgroup/holder/holder_basic.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ struct HolderBasic final : HolderObjBase<ObjT> {
6161
public:
6262
ObjT* get() override { return obj_; }
6363
bool exists() override { return obj_ != nullptr; }
64-
void* getPtr() override { return obj_; }
64+
std::byte* getPtr() override { return reinterpret_cast<std::byte*>(obj_); }
6565

6666
template <typename... Args>
6767
void reset(Args&&... args) {

src/vt/objgroup/manager.impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ ObjT* ObjGroupManager::get(ProxyElmType<ObjT> proxy) {
288288
auto iter = objs_.find(proxy_bits);
289289
vtAssert(iter != objs_.end(), "Obj must exist on this node");
290290
HolderBaseType* holder = iter->second.get();
291-
return static_cast<ObjT*>(holder->getPtr());
291+
return reinterpret_cast<ObjT*>(holder->getPtr());
292292
}
293293

294294
template <typename ObjT, typename... Args>

src/vt/objgroup/manager.static.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ decltype(auto) invoke(
9696
return runnable::makeRunnableVoid(false, han, this_node)
9797
.withObjGroup(elm)
9898
.withLBData(lb_data, elm_id)
99-
.runLambda(f, static_cast<ObjT*>(elm), msg.get());
99+
.runLambda(f, reinterpret_cast<ObjT*>(elm), msg.get());
100100
}
101101

102102
template <typename MsgT>

src/vt/objgroup/proxy/proxy_objgroup.impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ typename Proxy<ObjT>::PendingSendType Proxy<ObjT>::reduce(MsgPtrT inmsg, ReduceS
279279
template <typename ObjT>
280280
ObjT* Proxy<ObjT>::get() const {
281281
auto proxy = Proxy<ObjT>(*this);
282-
return theObjGroup()->get<ObjT>(proxy);
282+
return reinterpret_cast<ObjT*>(theObjGroup()->get<ObjT>(proxy));
283283
}
284284

285285
template <typename ObjT>

0 commit comments

Comments
 (0)