#908 message- retry-reverted

- Fun times.
DARMA-tasking · Jul 7, 2020 · 49182b0 · 49182b0
1 parent 5e3df17
commit 49182b0
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/vt/messaging/message/message_serialize.h b/src/vt/messaging/message/message_serialize.h
@@ -90,12 +90,9 @@ struct has_own_serialize_member_t : std::false_type {};
 template <typename U>
 struct has_own_serialize_member_t<U,
   std::enable_if_t<
-    cxx14_conjunction<
-      has_any_serialize_member_t<U>,
-      std::is_same<
-        void (U::*)(::checkpoint::Sizer&),
-        decltype(&U::template serialize<SerializeSizerType>)
-      >
+    std::is_same<
+      void (U::*)(::checkpoint::Sizer&),
+      decltype(&U::template serialize<SerializeSizerType>)
     >::value
   >>
   : std::true_type
@@ -106,7 +103,10 @@ struct has_own_serialize_member_t<U,
 template <typename T>
 static constexpr auto const has_own_serialize =
   ::checkpoint::SerializableTraits<T>::has_serialize_noninstrusive
-  or has_own_serialize_member_t<T>::value;
+  or cxx14_conjunction<
+    has_any_serialize_member_t<T>,
+    has_own_serialize_member_t<T>
+  >::value;
 
 #endif