#1974: replace std::is_pod with `std::is_standard_layout && std::is…

…_trivial`
DARMA-tasking · Sep 23, 2022 · 382275a · 382275a
1 parent 13c86c5
commit 382275a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/vt/messaging/envelope/envelope_base.h b/src/vt/messaging/envelope/envelope_base.h
@@ -113,8 +113,7 @@ namespace vt {
 
 using Envelope = messaging::ActiveEnvelope;
 
-static_assert(std::is_pod<Envelope>(), "Envelope must be POD");
-static_assert(std::is_trivially_destructible<Envelope>(), "Envelope must be trivially destructible");
+static_assert(std::is_standard_layout<Envelope>::value && std::is_trivial<Envelope>::value, "Envelope must be standard layout and trivial");
 
 } /* end namespace vt */
 

diff --git a/src/vt/messaging/envelope/envelope_extended.h b/src/vt/messaging/envelope/envelope_extended.h
@@ -104,19 +104,19 @@ using EpochEnvelope    = messaging::EpochActiveEnvelope;
 using TagEnvelope      = messaging::TagActiveEnvelope;
 using EpochTagEnvelope = messaging::EpochTagActiveEnvelope;
 
-static_assert(std::is_pod<EpochEnvelope>(),    "EpochEnvelope must be POD");
-static_assert(std::is_pod<TagEnvelope>(),      "TagEnvelope must be POD");
-static_assert(std::is_pod<EpochTagEnvelope>(), "EpochTagEnvelope must be POD");
+static_assert(std::is_standard_layout<EpochEnvelope>::value,    "EpochEnvelope must be standard layout");
+static_assert(std::is_standard_layout<TagEnvelope>::value,      "TagEnvelope must be standard layout");
+static_assert(std::is_standard_layout<EpochTagEnvelope>::value, "EpochTagEnvelope must be standard layout");
 static_assert(
-  std::is_trivially_destructible<EpochEnvelope>(),
+  std::is_trivial<EpochEnvelope>::value,
   "EpochEnvelope must be trivial"
 );
 static_assert(
-  std::is_trivially_destructible<TagEnvelope>(),
+  std::is_trivial<TagEnvelope>::value,
   "TagEnvelope must be trivial"
 );
 static_assert(
-  std::is_trivially_destructible<EpochTagEnvelope>(),
+  std::is_trivial<EpochTagEnvelope>::value,
   "EpochTagEnvelope must be trivial"
 );
 

diff --git a/src/vt/messaging/envelope/payload_envelope.h b/src/vt/messaging/envelope/payload_envelope.h
@@ -92,7 +92,7 @@ inline void envelopeInitEmpty(PutShortEnvelope& env) {
   env.put_data_tag_ = no_tag;
 }
 
-static_assert(std::is_pod<PutShortEnvelope>(), "PutShortEnvelope must be POD");
+static_assert(std::is_standard_layout<PutShortEnvelope>::value && std::is_trivial<PutShortEnvelope>::value, "PutShortEnvelope must be standard layout and trivial");
 
 /**
  * \brief Get the put pointer