#908 messaging- see if NVCC will play when..

- Moving out the first test.. or perhaps even yield a better message.
DARMA-tasking · Jul 6, 2020 · 6f72dd2 · 6f72dd2
1 parent a0ddffd
commit 6f72dd2
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/vt/messaging/message/message_serialize.h b/src/vt/messaging/message/message_serialize.h
@@ -66,8 +66,8 @@ template <class T>
 struct has_any_serialize_member_t
 {
   template <typename U>
-  static auto test(const U* u) -> decltype(
-      std::declval<U>().template serialize<SerializeSizerType>(std::declval<SerializeSizerType&>())
+  static auto test(U* u) -> decltype(
+      u->template serialize<SerializeSizerType>(std::declval<SerializeSizerType&>())
       , char(0)) { return char(0); }
   static double test(...) { return 0; }
   static const bool value = (sizeof(test((T*)0)) == 1);
@@ -79,8 +79,7 @@ struct has_own_serialize_member_t : std::false_type {};
 template <typename U>
 struct has_own_serialize_member_t<U,
   std::enable_if_t<
-    has_any_serialize_member_t<U>::value
-    and std::is_same<
+    std::is_same<
       void (U::*)(::checkpoint::Sizer&),
       decltype(&U::template serialize<SerializeSizerType&>)
     >::value
@@ -93,7 +92,8 @@ 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 (has_any_serialize_member_t<U>::value
+      and has_own_serialize_member_t<T>::value);
 
 #endif