Permalink
Browse files

Merge pull request #3483 from STEllAR-GROUP/attributed_warning

Fixing type attribute warning for transfer_action
  • Loading branch information...
msimberg committed Oct 9, 2018
2 parents c1577d7 + 22ebe6a commit 72ace185d0f3da8dc14a4b8186795dc2d22d2e49
Showing with 12 additions and 0 deletions.
  1. +12 −0 hpx/runtime/actions/basic_action.hpp
@@ -861,6 +861,7 @@ namespace hpx { namespace serialization
#define HPX_REGISTER_ACTION_1(action) \
HPX_REGISTER_ACTION_2(action, action) \
/**/
#if defined(HPX_MSVC) || defined(HPX_MINGW)
#define HPX_REGISTER_ACTION_2(action, actionname) \
HPX_DEFINE_GET_ACTION_NAME_(action, actionname) \
HPX_REGISTER_ACTION_INVOCATION_COUNT(action) \
@@ -871,6 +872,17 @@ namespace hpx { namespace serialization
transfer_continuation_action< action>; \
}} \
/**/
#else
#define HPX_REGISTER_ACTION_2(action, actionname) \
HPX_DEFINE_GET_ACTION_NAME_(action, actionname) \
HPX_REGISTER_ACTION_INVOCATION_COUNT(action) \
HPX_REGISTER_PER_ACTION_DATA_COUNTER_TYPES(action) \
namespace hpx { namespace actions { \
template struct transfer_action< action>; \
template struct transfer_continuation_action< action>; \
}} \
/**/
#endif
#if defined(HPX_MSVC) || defined(HPX_MINGW)
#define HPX_REGISTER_ACTION_EXTERN_DECLARATION(action) \

0 comments on commit 72ace18

Please sign in to comment.