From a7b783bc5e052e7409b40cfefc6652509e8c69d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cezary=20Skrzy=C5=84ski?=
 <cezary.skrzynski@ng-analytics.com>
Date: Fri, 29 Nov 2024 14:35:48 +0100
Subject: [PATCH 1/2] #2372: use updated virtual serialization macros

---
 examples/collection/polymorphic_collection.cc    | 4 ++--
 src/vt/runtime/component/diagnostic_value.h      | 2 +-
 src/vt/runtime/component/diagnostic_value_base.h | 2 +-
 src/vt/vrt/collection/types/storage/store_elm.h  | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/examples/collection/polymorphic_collection.cc b/examples/collection/polymorphic_collection.cc
index 9f1356f1c4..8494e4d2db 100644
--- a/examples/collection/polymorphic_collection.cc
+++ b/examples/collection/polymorphic_collection.cc
@@ -48,7 +48,7 @@ static constexpr int32_t const default_num_elms = 16;
 struct InitialConsTag{};
 
 struct Hello : vt::Collection<Hello, vt::Index1D> {
-  checkpoint_virtual_serialize_root()
+  magistrate_virtual_serialize_root()
 
   explicit Hello(InitialConsTag) {}
   explicit Hello(checkpoint::SERIALIZE_CONSTRUCT_TAG) {}
@@ -68,7 +68,7 @@ struct Hello : vt::Collection<Hello, vt::Index1D> {
 
 template <typename T>
 struct HelloTyped : Hello {
-  checkpoint_virtual_serialize_derived_from(Hello)
+  magistrate_virtual_serialize_derived_from(Hello)
 
   explicit HelloTyped(InitialConsTag);
   explicit HelloTyped(checkpoint::SERIALIZE_CONSTRUCT_TAG)
diff --git a/src/vt/runtime/component/diagnostic_value.h b/src/vt/runtime/component/diagnostic_value.h
index 1a3905464a..5d6ec4c909 100644
--- a/src/vt/runtime/component/diagnostic_value.h
+++ b/src/vt/runtime/component/diagnostic_value.h
@@ -395,7 +395,7 @@ struct DiagnosticSnapshotValues {
 template <typename T>
 struct DiagnosticValue : DiagnosticBase {
 #if !vt_check_enabled(trace_only)
-  checkpoint_virtual_serialize_derived_from(DiagnosticBase)
+  magistrate_virtual_serialize_derived_from(DiagnosticBase)
 #endif
   /**
    * \internal \brief Create a new typed diagnostic value
diff --git a/src/vt/runtime/component/diagnostic_value_base.h b/src/vt/runtime/component/diagnostic_value_base.h
index c378acb293..32f55401e1 100644
--- a/src/vt/runtime/component/diagnostic_value_base.h
+++ b/src/vt/runtime/component/diagnostic_value_base.h
@@ -69,7 +69,7 @@ namespace vt { namespace runtime { namespace component { namespace detail {
  */
 struct DiagnosticBase {
   #if !vt_check_enabled(trace_only)
-  checkpoint_virtual_serialize_root()
+  magistrate_virtual_serialize_root()
 #endif
   /**
    * \internal \brief Construct a new diagnostic base value
diff --git a/src/vt/vrt/collection/types/storage/store_elm.h b/src/vt/vrt/collection/types/storage/store_elm.h
index b9b4e0732f..3309e9a860 100644
--- a/src/vt/vrt/collection/types/storage/store_elm.h
+++ b/src/vt/vrt/collection/types/storage/store_elm.h
@@ -63,7 +63,7 @@ namespace vt { namespace vrt { namespace collection { namespace storage {
  */
 struct StoreElmBase {
   /// uses polymorphic serialization
-  checkpoint_virtual_serialize_root()
+  magistrate_virtual_serialize_root()
 
   using json = nlohmann::json;
 
@@ -214,7 +214,7 @@ struct StoreElm<
 > : StoreElmBase
 {
   /// polymorphic serializer for derived class
-  checkpoint_virtual_serialize_derived_from(StoreElmBase)
+  magistrate_virtual_serialize_derived_from(StoreElmBase)
 
   /**
    * \brief Construct with value
@@ -329,7 +329,7 @@ struct StoreElm<
 > : StoreElmBase
 {
   /// polymorphic serializer for derived class
-  checkpoint_virtual_serialize_derived_from(StoreElmBase)
+  magistrate_virtual_serialize_derived_from(StoreElmBase)
 
   static_assert(
     std::is_trivially_copyable<T>::value and not std::is_pointer<T>::value,

From 0e7662af77e1e6ac8cd921fae86696be71fdaf17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cezary=20Skrzy=C5=84ski?=
 <cezary.skrzynski@ng-analytics.com>
Date: Fri, 6 Dec 2024 16:01:46 +0100
Subject: [PATCH 2/2] #2372: trigger rebuilding of docker images

---
 ci/docker/alpine-cpp.dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/docker/alpine-cpp.dockerfile b/ci/docker/alpine-cpp.dockerfile
index aeadfee2d7..9d11003e48 100644
--- a/ci/docker/alpine-cpp.dockerfile
+++ b/ci/docker/alpine-cpp.dockerfile
@@ -1,6 +1,6 @@
 
 ARG arch=amd64
-FROM alpine:3.16 as base
+FROM alpine:3.16 AS base
 
 ARG proxy=""
 
@@ -50,9 +50,9 @@ ENV CC=mpicc \
     CXX=mpicxx \
     PATH=/usr/lib/ccache/:$PATH
 
-FROM base as build
+FROM base AS build
 COPY . /vt
 RUN /vt/ci/build_cpp.sh /vt /build
 
-FROM build as test
+FROM build AS test
 RUN /vt/ci/test_cpp.sh /vt /build