added HPX_TRAITS_NONINTRUSIVE_POLYMORPHIC_TEMPLATE

STEllAR-GROUP · Apr 24, 2015 · d4d983e · sithhell · Apr 26, 2015 · d4d983e
1 parent 262a598
commit d4d983e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/hpx/runtime/serialization/detail/polymorphic_intrusive_factory.hpp b/hpx/runtime/serialization/detail/polymorphic_intrusive_factory.hpp
@@ -171,12 +171,12 @@ namespace hpx { namespace serialization { namespace detail
 
 #define HPX_SERIALIZATION_POLYMORPHIC_TEMPLATE(Class)                         \
   HPX_SERIALIZATION_POLYMORPHIC_WITH_NAME(                                    \
-      Class, util::type_id<Class>::typeid_.type_id();)                        \
+      Class, hpx::util::type_id<Class>::typeid_.type_id();)                   \
 /**/
 
 #define HPX_SERIALIZATION_POLYMORPHIC_TEMPLATE_SPLITTED(Class)                \
   HPX_SERIALIZATION_POLYMORPHIC_WITH_NAME_SPLITTED(                           \
-      Class, util::type_id<T>::typeid_.type_id();)                            \
+      Class, hpx::util::type_id<T>::typeid_.type_id();)                       \
 /**/
 
 #endif
diff --git a/hpx/traits/polymorphic_traits.hpp b/hpx/traits/polymorphic_traits.hpp
@@ -7,6 +7,8 @@
 #ifndef HPX_TRAITS_POLYMORPHIC_TRAITS_HPP
 #define HPX_TRAITS_POLYMORPHIC_TRAITS_HPP
 
+#include <hpx/util/detail/pp_strip_parens.hpp>
+
 #include <boost/mpl/bool.hpp>
 #include <boost/type_traits/is_class.hpp>
 #include <boost/utility/enable_if.hpp>
@@ -55,12 +57,20 @@ namespace hpx { namespace traits {
 
 }}
 
-#define HPX_TRAITS_NONINTRUSIVE_POLYMORPHIC(Class)                            \
-  namespace hpx { namespace traits {                                          \
-      template <>                                                             \
-      struct is_nonintrusive_polymorphic<Class>:                              \
-          boost::mpl::true_ {};                                               \
-  }}                                                                          \
+#define HPX_TRAITS_NONINTRUSIVE_POLYMORPHIC(Class)                          \
+    namespace hpx { namespace traits {                                      \
+        template <>                                                         \
+        struct is_nonintrusive_polymorphic<Class>:                          \
+            boost::mpl::true_ {};                                           \
+    }}                                                                      \
+/**/
+
+#define HPX_TRAITS_NONINTRUSIVE_POLYMORPHIC_TEMPLATE(TEMPLATE, ARG_LIST)    \
+    namespace hpx { namespace traits {                                      \
+        HPX_UTIL_STRIP(TEMPLATE)                                            \
+        struct is_nonintrusive_polymorphic<HPX_UTIL_STRIP(ARG_LIST)>        \
+          : boost::mpl::true_ {};                                           \
+    }}                                                                      \
 /**/
 
 #endif
diff --git a/tests/unit/serialization/polymorphic/serialization_polymorphic_nonintrusive_abstract.cpp b/tests/unit/serialization/polymorphic/serialization_polymorphic_nonintrusive_abstract.cpp
@@ -30,11 +30,7 @@ struct Base
     std::string prefix_;
 };
 
-namespace hpx { namespace traits {
-    template <typename T>
-    struct is_nonintrusive_polymorphic<Base<T> >
-      : boost::mpl::true_ {};
-}}
+HPX_TRAITS_NONINTRUSIVE_POLYMORPHIC_TEMPLATE((template <class T>), Base<T>)
 
 template <typename Archive, typename T>
 void serialize(Archive & ar, Base<T> & b, unsigned)
@@ -60,11 +56,7 @@ struct Derived1 : Base<T>
     std::size_t size_;
 };
 
-namespace hpx { namespace traits {
-    template <typename T>
-    struct is_nonintrusive_polymorphic<Derived1<T> >
-      : boost::mpl::true_ {};
-}}
+HPX_TRAITS_NONINTRUSIVE_POLYMORPHIC_TEMPLATE((template <class T>), Derived1<T>)
 
 template <typename Archive, typename T>
 void serialize(Archive & ar, Derived1<T> & d1, unsigned)