Skip to content

Commit 6190033

Browse files
authored
Merge pull request #2374 from DARMA-tasking/2372-use-magistrate-virtual-serialize
#2372: use updated virtual serialization macros
2 parents 2fd8152 + 0e7662a commit 6190033

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

ci/docker/alpine-cpp.dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
ARG arch=amd64
3-
FROM alpine:3.16 as base
3+
FROM alpine:3.16 AS base
44

55
ARG proxy=""
66

@@ -50,9 +50,9 @@ ENV CC=mpicc \
5050
CXX=mpicxx \
5151
PATH=/usr/lib/ccache/:$PATH
5252

53-
FROM base as build
53+
FROM base AS build
5454
COPY . /vt
5555
RUN /vt/ci/build_cpp.sh /vt /build
5656

57-
FROM build as test
57+
FROM build AS test
5858
RUN /vt/ci/test_cpp.sh /vt /build

examples/collection/polymorphic_collection.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ static constexpr int32_t const default_num_elms = 16;
4848
struct InitialConsTag{};
4949

5050
struct Hello : vt::Collection<Hello, vt::Index1D> {
51-
checkpoint_virtual_serialize_root()
51+
magistrate_virtual_serialize_root()
5252

5353
explicit Hello(InitialConsTag) {}
5454
explicit Hello(checkpoint::SERIALIZE_CONSTRUCT_TAG) {}
@@ -68,7 +68,7 @@ struct Hello : vt::Collection<Hello, vt::Index1D> {
6868

6969
template <typename T>
7070
struct HelloTyped : Hello {
71-
checkpoint_virtual_serialize_derived_from(Hello)
71+
magistrate_virtual_serialize_derived_from(Hello)
7272

7373
explicit HelloTyped(InitialConsTag);
7474
explicit HelloTyped(checkpoint::SERIALIZE_CONSTRUCT_TAG)

src/vt/runtime/component/diagnostic_value.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ struct DiagnosticSnapshotValues {
395395
template <typename T>
396396
struct DiagnosticValue : DiagnosticBase {
397397
#if !vt_check_enabled(trace_only)
398-
checkpoint_virtual_serialize_derived_from(DiagnosticBase)
398+
magistrate_virtual_serialize_derived_from(DiagnosticBase)
399399
#endif
400400
/**
401401
* \internal \brief Create a new typed diagnostic value

src/vt/runtime/component/diagnostic_value_base.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ namespace vt { namespace runtime { namespace component { namespace detail {
6969
*/
7070
struct DiagnosticBase {
7171
#if !vt_check_enabled(trace_only)
72-
checkpoint_virtual_serialize_root()
72+
magistrate_virtual_serialize_root()
7373
#endif
7474
/**
7575
* \internal \brief Construct a new diagnostic base value

src/vt/vrt/collection/types/storage/store_elm.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ namespace vt { namespace vrt { namespace collection { namespace storage {
6363
*/
6464
struct StoreElmBase {
6565
/// uses polymorphic serialization
66-
checkpoint_virtual_serialize_root()
66+
magistrate_virtual_serialize_root()
6767

6868
using json = nlohmann::json;
6969

@@ -214,7 +214,7 @@ struct StoreElm<
214214
> : StoreElmBase
215215
{
216216
/// polymorphic serializer for derived class
217-
checkpoint_virtual_serialize_derived_from(StoreElmBase)
217+
magistrate_virtual_serialize_derived_from(StoreElmBase)
218218

219219
/**
220220
* \brief Construct with value
@@ -329,7 +329,7 @@ struct StoreElm<
329329
> : StoreElmBase
330330
{
331331
/// polymorphic serializer for derived class
332-
checkpoint_virtual_serialize_derived_from(StoreElmBase)
332+
magistrate_virtual_serialize_derived_from(StoreElmBase)
333333

334334
static_assert(
335335
std::is_trivially_copyable<T>::value and not std::is_pointer<T>::value,

0 commit comments

Comments
 (0)