From b1e27e72280c288456fe647ad3ac8d258dc14d5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cezary=20Skrzy=C5=84ski?=
 <cezary.skrzynski@ng-analytics.com>
Date: Tue, 23 Feb 2021 18:36:10 +0100
Subject: [PATCH] #1258: move skip calls to correct location

---
 src/vt/pipe/callback/cb_union/cb_raw.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/vt/pipe/callback/cb_union/cb_raw.h b/src/vt/pipe/callback/cb_union/cb_raw.h
index 8ef6c6b365..547f340b0c 100644
--- a/src/vt/pipe/callback/cb_union/cb_raw.h
+++ b/src/vt/pipe/callback/cb_union/cb_raw.h
@@ -222,6 +222,9 @@ struct GeneralCallback {
     using EnumDataType = typename std::underlying_type<CallbackEnum>::type;
     EnumDataType val = static_cast<EnumDataType>(active_);
     s | val;
+
+    s.skip(active_);
+    s.skip(u_);
     active_ = static_cast<CallbackEnum>(val);
     switch (active_) {
     case CallbackEnum::AnonCB:
@@ -255,9 +258,6 @@ struct GeneralCallback {
       vtAssert(0, "Should be unreachable");
       break;
     }
-
-    s.skip(active_);
-    s.skip(u_);
   }
 
   bool null()  const { return active_ == CallbackEnum::NoCB; }