diff --git a/examples/accumulators/server/template_accumulator.hpp b/examples/accumulators/server/template_accumulator.hpp index 175c5da38eaf..f87ba8e80c05 100644 --- a/examples/accumulators/server/template_accumulator.hpp +++ b/examples/accumulators/server/template_accumulator.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2007-2016 Hartmut Kaiser +// Copyright (c) 2007-2017 Hartmut Kaiser // Copyright (c) 2011 Bryce Adelstein-Lelbach // // Distributed under the Boost Software License, Version 1.0. (See accompanying @@ -10,6 +10,8 @@ #include #include +#include + /////////////////////////////////////////////////////////////////////////////// namespace examples { namespace server { @@ -88,34 +90,34 @@ namespace examples { namespace server #define REGISTER_TEMPLATE_ACCUMULATOR_DECLARATION(type) \ HPX_REGISTER_ACTION_DECLARATION( \ examples::server::template_accumulator::reset_action, \ - BOOST_PP_CAT(__template_accumulator_reset_action_, type)); \ + HPX_PP_CAT(__template_accumulator_reset_action_, type)); \ \ HPX_REGISTER_ACTION_DECLARATION( \ examples::server::template_accumulator::add_action, \ - BOOST_PP_CAT(__template_accumulator_add_action_, type)); \ + HPX_PP_CAT(__template_accumulator_add_action_, type)); \ \ HPX_REGISTER_ACTION_DECLARATION( \ examples::server::template_accumulator::query_action, \ - BOOST_PP_CAT(__template_accumulator_query_action_, type)); \ + HPX_PP_CAT(__template_accumulator_query_action_, type)); \ /**/ #define REGISTER_TEMPLATE_ACCUMULATOR(type) \ HPX_REGISTER_ACTION( \ examples::server::template_accumulator::reset_action, \ - BOOST_PP_CAT(__template_accumulator_reset_action_, type)); \ + HPX_PP_CAT(__template_accumulator_reset_action_, type)); \ \ HPX_REGISTER_ACTION( \ examples::server::template_accumulator::add_action, \ - BOOST_PP_CAT(__template_accumulator_add_action_, type)); \ + HPX_PP_CAT(__template_accumulator_add_action_, type)); \ \ HPX_REGISTER_ACTION( \ examples::server::template_accumulator::query_action, \ - BOOST_PP_CAT(__template_accumulator_query_action_, type)); \ + HPX_PP_CAT(__template_accumulator_query_action_, type)); \ \ typedef ::hpx::components::component< \ examples::server::template_accumulator \ - > BOOST_PP_CAT(__template_accumulator_, type); \ - HPX_REGISTER_COMPONENT(BOOST_PP_CAT(__template_accumulator_, type)) \ + > HPX_PP_CAT(__template_accumulator_, type); \ + HPX_REGISTER_COMPONENT(HPX_PP_CAT(__template_accumulator_, type)) \ /**/ #endif diff --git a/hpx/components/containers/partitioned_vector/partitioned_vector_component.hpp b/hpx/components/containers/partitioned_vector/partitioned_vector_component.hpp index 05affc811d82..7dde16b0049a 100644 --- a/hpx/components/containers/partitioned_vector/partitioned_vector_component.hpp +++ b/hpx/components/containers/partitioned_vector/partitioned_vector_component.hpp @@ -24,11 +24,12 @@ #include #include #include +#include +#include +#include #include -#include - #include #include #include @@ -406,28 +407,28 @@ namespace hpx { namespace server HPX_REGISTER_VECTOR_DECLARATION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_VECTOR_DECLARATION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_VECTOR_DECLARATION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_VECTOR_DECLARATION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ #define HPX_REGISTER_VECTOR_DECLARATION_IMPL(type, name) \ HPX_REGISTER_ACTION_DECLARATION(type::get_value_action, \ - BOOST_PP_CAT(__vector_get_value_action_, name)); \ + HPX_PP_CAT(__vector_get_value_action_, name)); \ HPX_REGISTER_ACTION_DECLARATION(type::get_values_action, \ - BOOST_PP_CAT(__vector_get_values_action_, name)); \ + HPX_PP_CAT(__vector_get_values_action_, name)); \ HPX_REGISTER_ACTION_DECLARATION(type::set_value_action, \ - BOOST_PP_CAT(__vector_set_value_action_, name)); \ + HPX_PP_CAT(__vector_set_value_action_, name)); \ HPX_REGISTER_ACTION_DECLARATION(type::set_values_action, \ - BOOST_PP_CAT(__vector_set_values_action_, name)); \ + HPX_PP_CAT(__vector_set_values_action_, name)); \ HPX_REGISTER_ACTION_DECLARATION(type::size_action, \ - BOOST_PP_CAT(__vector_size_action_, name)); \ + HPX_PP_CAT(__vector_size_action_, name)); \ HPX_REGISTER_ACTION_DECLARATION(type::resize_action, \ - BOOST_PP_CAT(__vector_resize_action_, name)); \ + HPX_PP_CAT(__vector_resize_action_, name)); \ HPX_REGISTER_ACTION_DECLARATION(type::get_copied_data_action, \ - BOOST_PP_CAT(__vector_get_copied_data_action_, name)); \ + HPX_PP_CAT(__vector_get_copied_data_action_, name)); \ HPX_REGISTER_ACTION_DECLARATION(type::set_data_action, \ - BOOST_PP_CAT(__vector_set_data_action_, name)); \ + HPX_PP_CAT(__vector_set_data_action_, name)); \ /**/ #define HPX_REGISTER_VECTOR_DECLARATION_1(type) \ @@ -438,39 +439,39 @@ namespace hpx { namespace server /**/ #define HPX_REGISTER_VECTOR_DECLARATION_3(type, data, name) \ typedef ::hpx::server::partitioned_vector \ - BOOST_PP_CAT(__partitioned_vector_, BOOST_PP_CAT(type, name)); \ + HPX_PP_CAT(__partitioned_vector_, HPX_PP_CAT(type, name)); \ HPX_REGISTER_VECTOR_DECLARATION_IMPL( \ - BOOST_PP_CAT(__partitioned_vector_, BOOST_PP_CAT(type, name)), name) \ + HPX_PP_CAT(__partitioned_vector_, HPX_PP_CAT(type, name)), name) \ /**/ #define HPX_REGISTER_PARTITIONED_VECTOR(...) \ HPX_REGISTER_VECTOR_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_VECTOR_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_VECTOR_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_VECTOR_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ #define HPX_REGISTER_VECTOR_IMPL(type, name) \ HPX_REGISTER_ACTION(type::get_value_action, \ - BOOST_PP_CAT(__vector_get_value_action_, name)); \ + HPX_PP_CAT(__vector_get_value_action_, name)); \ HPX_REGISTER_ACTION(type::get_values_action, \ - BOOST_PP_CAT(__vector_get_values_action_, name)); \ + HPX_PP_CAT(__vector_get_values_action_, name)); \ HPX_REGISTER_ACTION(type::set_value_action, \ - BOOST_PP_CAT(__vector_set_value_action_, name)); \ + HPX_PP_CAT(__vector_set_value_action_, name)); \ HPX_REGISTER_ACTION(type::set_values_action, \ - BOOST_PP_CAT(__vector_set_values_action_, name)); \ + HPX_PP_CAT(__vector_set_values_action_, name)); \ HPX_REGISTER_ACTION(type::size_action, \ - BOOST_PP_CAT(__vector_size_action_, name)); \ + HPX_PP_CAT(__vector_size_action_, name)); \ HPX_REGISTER_ACTION(type::resize_action, \ - BOOST_PP_CAT(__vector_resize_action_, name)); \ + HPX_PP_CAT(__vector_resize_action_, name)); \ HPX_REGISTER_ACTION(type::get_copied_data_action, \ - BOOST_PP_CAT(__vector_get_copied_data_action_, name)); \ + HPX_PP_CAT(__vector_get_copied_data_action_, name)); \ HPX_REGISTER_ACTION(type::set_data_action, \ - BOOST_PP_CAT(__vector_set_data_action_, name)); \ - typedef ::hpx::components::component BOOST_PP_CAT(__vector_, name); \ - HPX_REGISTER_COMPONENT(BOOST_PP_CAT(__vector_, name)) \ + HPX_PP_CAT(__vector_set_data_action_, name)); \ + typedef ::hpx::components::component HPX_PP_CAT(__vector_, name); \ + HPX_REGISTER_COMPONENT(HPX_PP_CAT(__vector_, name)) \ /**/ #define HPX_REGISTER_VECTOR_1(type) \ @@ -481,9 +482,9 @@ namespace hpx { namespace server /**/ #define HPX_REGISTER_VECTOR_3(type, data, name) \ typedef ::hpx::server::partitioned_vector \ - BOOST_PP_CAT(__partitioned_vector_, BOOST_PP_CAT(type, name)); \ + HPX_PP_CAT(__partitioned_vector_, HPX_PP_CAT(type, name)); \ HPX_REGISTER_VECTOR_IMPL( \ - BOOST_PP_CAT(__partitioned_vector_, BOOST_PP_CAT(type, name)), name) \ + HPX_PP_CAT(__partitioned_vector_, HPX_PP_CAT(type, name)), name) \ /**/ /////////////////////////////////////////////////////////////////////////////// diff --git a/hpx/components/containers/unordered/partition_unordered_map_component.hpp b/hpx/components/containers/unordered/partition_unordered_map_component.hpp index 33bd470cf124..4ce1d33dcb4b 100644 --- a/hpx/components/containers/unordered/partition_unordered_map_component.hpp +++ b/hpx/components/containers/unordered/partition_unordered_map_component.hpp @@ -29,8 +29,9 @@ #include #include #include - -#include +#include +#include +#include #include #include @@ -329,8 +330,8 @@ namespace hpx { namespace server HPX_REGISTER_UNORDERED_MAP_DECLARATION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_UNORDERED_MAP_DECLARATION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_UNORDERED_MAP_DECLARATION_, HPX_UTIL_PP_NARG(__VA_ARGS__)\ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_UNORDERED_MAP_DECLARATION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -348,48 +349,48 @@ namespace hpx { namespace server #define HPX_REGISTER_UNORDERED_MAP_DECLARATION_5(key, type, hash, equal, name)\ typedef ::hpx::server::partition_unordered_map \ - BOOST_PP_CAT(partition_unordered_map, __LINE__); \ + HPX_PP_CAT(partition_unordered_map, __LINE__); \ HPX_REGISTER_ACTION_DECLARATION( \ - BOOST_PP_CAT(partition_unordered_map, __LINE__)::get_value_action, \ - BOOST_PP_CAT(__unordered_map_get_value_action_, name)); \ + HPX_PP_CAT(partition_unordered_map, __LINE__)::get_value_action, \ + HPX_PP_CAT(__unordered_map_get_value_action_, name)); \ HPX_REGISTER_ACTION_DECLARATION( \ - BOOST_PP_CAT(partition_unordered_map, __LINE__)::get_values_action, \ - BOOST_PP_CAT(__unordered_map_get_values_action_, name)); \ + HPX_PP_CAT(partition_unordered_map, __LINE__)::get_values_action, \ + HPX_PP_CAT(__unordered_map_get_values_action_, name)); \ HPX_REGISTER_ACTION_DECLARATION( \ - BOOST_PP_CAT(partition_unordered_map, __LINE__)::set_value_action, \ - BOOST_PP_CAT(__unordered_map_set_value_action_, name)); \ + HPX_PP_CAT(partition_unordered_map, __LINE__)::set_value_action, \ + HPX_PP_CAT(__unordered_map_set_value_action_, name)); \ HPX_REGISTER_ACTION_DECLARATION( \ - BOOST_PP_CAT(partition_unordered_map, __LINE__)::set_values_action, \ - BOOST_PP_CAT(__unordered_map_set_values_action_, name)); \ + HPX_PP_CAT(partition_unordered_map, __LINE__)::set_values_action, \ + HPX_PP_CAT(__unordered_map_set_values_action_, name)); \ HPX_REGISTER_ACTION_DECLARATION( \ - BOOST_PP_CAT(partition_unordered_map, __LINE__)::size_action, \ - BOOST_PP_CAT(__unordered_map_size_action_, name)); \ + HPX_PP_CAT(partition_unordered_map, __LINE__)::size_action, \ + HPX_PP_CAT(__unordered_map_size_action_, name)); \ HPX_REGISTER_ACTION_DECLARATION( \ - BOOST_PP_CAT(partition_unordered_map, __LINE__)::erase_action, \ - BOOST_PP_CAT(__unordered_map_erase_action_, name)); \ + HPX_PP_CAT(partition_unordered_map, __LINE__)::erase_action, \ + HPX_PP_CAT(__unordered_map_erase_action_, name)); \ HPX_REGISTER_ACTION_DECLARATION( \ - BOOST_PP_CAT(partition_unordered_map, __LINE__)::get_copied_data_action,\ - BOOST_PP_CAT(__unordered_map_get_copied_data_action_, name)); \ + HPX_PP_CAT(partition_unordered_map, __LINE__)::get_copied_data_action,\ + HPX_PP_CAT(__unordered_map_get_copied_data_action_, name)); \ HPX_REGISTER_ACTION_DECLARATION( \ - BOOST_PP_CAT(partition_unordered_map, __LINE__)::set_copied_data_action,\ - BOOST_PP_CAT(__unordered_map_set_copied_data_action_, name)); \ + HPX_PP_CAT(partition_unordered_map, __LINE__)::set_copied_data_action,\ + HPX_PP_CAT(__unordered_map_set_copied_data_action_, name)); \ typedef std::plus \ - BOOST_PP_CAT(partition_unordered_map_size_reduceop, __LINE__); \ - typedef BOOST_PP_CAT(partition_unordered_map, __LINE__)::size_action \ - BOOST_PP_CAT(BOOST_PP_CAT(partition_unordered_map, size_action), \ + HPX_PP_CAT(partition_unordered_map_size_reduceop, __LINE__); \ + typedef HPX_PP_CAT(partition_unordered_map, __LINE__)::size_action \ + HPX_PP_CAT(HPX_PP_CAT(partition_unordered_map, size_action), \ __LINE__); \ HPX_REGISTER_REDUCE_ACTION_DECLARATION( \ - BOOST_PP_CAT(BOOST_PP_CAT(partition_unordered_map, size_action), \ + HPX_PP_CAT(HPX_PP_CAT(partition_unordered_map, size_action), \ __LINE__), \ - BOOST_PP_CAT(partition_unordered_map_size_reduceop, __LINE__)); \ + HPX_PP_CAT(partition_unordered_map_size_reduceop, __LINE__)); \ /**/ #define HPX_REGISTER_UNORDERED_MAP(...) \ HPX_REGISTER_UNORDERED_MAP_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_UNORDERED_MAP_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_UNORDERED_MAP_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_UNORDERED_MAP_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -407,44 +408,44 @@ namespace hpx { namespace server #define HPX_REGISTER_UNORDERED_MAP_5(key, type, hash, equal, name) \ typedef ::hpx::server::partition_unordered_map \ - BOOST_PP_CAT(partition_unordered_map, __LINE__); \ + HPX_PP_CAT(partition_unordered_map, __LINE__); \ HPX_REGISTER_ACTION( \ - BOOST_PP_CAT(partition_unordered_map, __LINE__)::get_value_action, \ - BOOST_PP_CAT(__unordered_map_get_value_action_, name)); \ + HPX_PP_CAT(partition_unordered_map, __LINE__)::get_value_action, \ + HPX_PP_CAT(__unordered_map_get_value_action_, name)); \ HPX_REGISTER_ACTION( \ - BOOST_PP_CAT(partition_unordered_map, __LINE__)::get_values_action, \ - BOOST_PP_CAT(__unordered_map_get_values_action_, name)); \ + HPX_PP_CAT(partition_unordered_map, __LINE__)::get_values_action, \ + HPX_PP_CAT(__unordered_map_get_values_action_, name)); \ HPX_REGISTER_ACTION( \ - BOOST_PP_CAT(partition_unordered_map, __LINE__)::set_value_action, \ - BOOST_PP_CAT(__unordered_map_set_value_action_, name)); \ + HPX_PP_CAT(partition_unordered_map, __LINE__)::set_value_action, \ + HPX_PP_CAT(__unordered_map_set_value_action_, name)); \ HPX_REGISTER_ACTION( \ - BOOST_PP_CAT(partition_unordered_map, __LINE__)::set_values_action, \ - BOOST_PP_CAT(__unordered_map_set_values_action_, name)); \ + HPX_PP_CAT(partition_unordered_map, __LINE__)::set_values_action, \ + HPX_PP_CAT(__unordered_map_set_values_action_, name)); \ HPX_REGISTER_ACTION( \ - BOOST_PP_CAT(partition_unordered_map, __LINE__)::size_action, \ - BOOST_PP_CAT(__unordered_map_size_action_, name)); \ + HPX_PP_CAT(partition_unordered_map, __LINE__)::size_action, \ + HPX_PP_CAT(__unordered_map_size_action_, name)); \ HPX_REGISTER_ACTION( \ - BOOST_PP_CAT(partition_unordered_map, __LINE__)::erase_action, \ - BOOST_PP_CAT(__unordered_map_erase_action_, name)); \ + HPX_PP_CAT(partition_unordered_map, __LINE__)::erase_action, \ + HPX_PP_CAT(__unordered_map_erase_action_, name)); \ HPX_REGISTER_ACTION( \ - BOOST_PP_CAT(partition_unordered_map, __LINE__)::get_copied_data_action,\ - BOOST_PP_CAT(__unordered_map_get_copied_data_action_, name)); \ + HPX_PP_CAT(partition_unordered_map, __LINE__)::get_copied_data_action,\ + HPX_PP_CAT(__unordered_map_get_copied_data_action_, name)); \ HPX_REGISTER_ACTION( \ - BOOST_PP_CAT(partition_unordered_map, __LINE__)::set_copied_data_action,\ - BOOST_PP_CAT(__unordered_map_set_copied_data_action_, name)); \ + HPX_PP_CAT(partition_unordered_map, __LINE__)::set_copied_data_action,\ + HPX_PP_CAT(__unordered_map_set_copied_data_action_, name)); \ typedef std::plus \ - BOOST_PP_CAT(partition_unordered_map_size_reduceop, __LINE__); \ - typedef BOOST_PP_CAT(partition_unordered_map, __LINE__)::size_action \ - BOOST_PP_CAT(BOOST_PP_CAT(partition_unordered_map, size_action), \ + HPX_PP_CAT(partition_unordered_map_size_reduceop, __LINE__); \ + typedef HPX_PP_CAT(partition_unordered_map, __LINE__)::size_action \ + HPX_PP_CAT(HPX_PP_CAT(partition_unordered_map, size_action), \ __LINE__); \ HPX_REGISTER_REDUCE_ACTION( \ - BOOST_PP_CAT(BOOST_PP_CAT(partition_unordered_map, size_action), \ + HPX_PP_CAT(HPX_PP_CAT(partition_unordered_map, size_action), \ __LINE__), \ - BOOST_PP_CAT(partition_unordered_map_size_reduceop, __LINE__)); \ + HPX_PP_CAT(partition_unordered_map_size_reduceop, __LINE__)); \ typedef ::hpx::components::simple_component< \ - BOOST_PP_CAT(partition_unordered_map, __LINE__) \ - > BOOST_PP_CAT(__unordered_map_, name); \ - HPX_REGISTER_COMPONENT(BOOST_PP_CAT(__unordered_map_, name)) \ + HPX_PP_CAT(partition_unordered_map, __LINE__) \ + > HPX_PP_CAT(__unordered_map_, name); \ + HPX_REGISTER_COMPONENT(HPX_PP_CAT(__unordered_map_, name)) \ /**/ /////////////////////////////////////////////////////////////////////////////// diff --git a/hpx/config.hpp b/hpx/config.hpp index f1a3dbf7056e..8258c8b0d882 100644 --- a/hpx/config.hpp +++ b/hpx/config.hpp @@ -36,8 +36,8 @@ #include #endif -#include -#include +#include +#include #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) // On Windows, make sure winsock.h is not included even if windows.h is @@ -326,7 +326,7 @@ #endif #if defined(HPX_DEBUG) -# define HPX_MANGLE_NAME(n) BOOST_PP_CAT(n, d) +# define HPX_MANGLE_NAME(n) HPX_PP_CAT(n, d) # define HPX_MANGLE_STRING(n) n + "d" #else # define HPX_MANGLE_NAME(n) n @@ -339,7 +339,7 @@ #endif #if !defined(HPX_COMPONENT_STRING) -# define HPX_COMPONENT_STRING BOOST_PP_STRINGIZE(HPX_COMPONENT_NAME) +# define HPX_COMPONENT_STRING HPX_PP_STRINGIZE(HPX_COMPONENT_NAME) #endif #if !defined(HPX_PLUGIN_COMPONENT_PREFIX) @@ -356,7 +356,7 @@ #endif #if !defined(HPX_PLUGIN_STRING) -# define HPX_PLUGIN_STRING BOOST_PP_STRINGIZE(HPX_PLUGIN_NAME) +# define HPX_PLUGIN_STRING HPX_PP_STRINGIZE(HPX_PLUGIN_NAME) #endif #if !defined(HPX_PLUGIN_PLUGIN_PREFIX) @@ -366,7 +366,7 @@ /////////////////////////////////////////////////////////////////////////////// #if !defined(HPX_APPLICATION_STRING) # if defined(HPX_APPLICATION_NAME) -# define HPX_APPLICATION_STRING BOOST_PP_STRINGIZE(HPX_APPLICATION_NAME) +# define HPX_APPLICATION_STRING HPX_PP_STRINGIZE(HPX_APPLICATION_NAME) # else # define HPX_APPLICATION_STRING "unknown HPX application" # endif diff --git a/hpx/config/boost/compiler/intel.hpp b/hpx/config/boost/compiler/intel.hpp index 11bec531d7c1..585832ae9bf1 100644 --- a/hpx/config/boost/compiler/intel.hpp +++ b/hpx/config/boost/compiler/intel.hpp @@ -12,6 +12,8 @@ // See http://www.boost.org for most recent version. +// hpxinspect:nodeprecatedname:BOOST_STRINGIZE + // make sure header testing does not throw errors #if defined(__INTEL_COMPILER) diff --git a/hpx/config/defaults.hpp b/hpx/config/defaults.hpp index 5e394f4de608..423b0f6277d6 100644 --- a/hpx/config/defaults.hpp +++ b/hpx/config/defaults.hpp @@ -8,18 +8,17 @@ #define HPX_CONFIG_DEFAULTS_SEP_26_2008_0352PM #include +#include #include -#include - // The HPX runtime needs to know where to look for the HPX ini files if no ini // path is specified by the user (default in $HPX_LOCATION/share/hpx-1.0.0/ini). // Also, the default component path is set within the same prefix #define HPX_BASE_DIR_NAME "hpx-" \ - BOOST_PP_STRINGIZE(HPX_VERSION_MAJOR) "." \ - BOOST_PP_STRINGIZE(HPX_VERSION_MINOR) "." \ - BOOST_PP_STRINGIZE(HPX_VERSION_SUBMINOR) \ + HPX_PP_STRINGIZE(HPX_VERSION_MAJOR) "." \ + HPX_PP_STRINGIZE(HPX_VERSION_MINOR) "." \ + HPX_PP_STRINGIZE(HPX_VERSION_SUBMINOR) \ /**/ #if !defined(HPX_DEFAULT_INI_PATH) diff --git a/hpx/config/version.hpp b/hpx/config/version.hpp index 26c1385c3110..c9b3f4fc4978 100644 --- a/hpx/config/version.hpp +++ b/hpx/config/version.hpp @@ -12,8 +12,8 @@ #include #include +#include -#include #include /////////////////////////////////////////////////////////////////////////////// @@ -48,15 +48,15 @@ // The version check enforces the major and minor version numbers to match for // every compilation unit to be compiled. #define HPX_CHECK_VERSION \ - BOOST_PP_CAT(hpx_check_version_, \ - BOOST_PP_CAT(HPX_VERSION_MAJOR, \ - BOOST_PP_CAT(_, HPX_VERSION_MINOR))) \ + HPX_PP_CAT(hpx_check_version_, \ + HPX_PP_CAT(HPX_VERSION_MAJOR, \ + HPX_PP_CAT(_, HPX_VERSION_MINOR))) \ /**/ // The version check enforces the major and minor version numbers to match for // every compilation unit to be compiled. #define HPX_CHECK_BOOST_VERSION \ - BOOST_PP_CAT(hpx_check_boost_version_, BOOST_VERSION) \ + HPX_PP_CAT(hpx_check_boost_version_, BOOST_VERSION) \ /**/ /////////////////////////////////////////////////////////////////////////////// diff --git a/hpx/include/util.hpp b/hpx/include/util.hpp index 14fdb8873ad5..a6a23ec4d5ba 100644 --- a/hpx/include/util.hpp +++ b/hpx/include/util.hpp @@ -13,7 +13,11 @@ #include #include #include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/hpx/lcos/base_lco_with_value.hpp b/hpx/lcos/base_lco_with_value.hpp index 81abacba1a78..01f8c47e9c0d 100644 --- a/hpx/lcos/base_lco_with_value.hpp +++ b/hpx/lcos/base_lco_with_value.hpp @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -164,10 +165,10 @@ namespace hpx { namespace traits #define HPX_REGISTER_BASE_LCO_WITH_VALUE_DECLARATION(Value, Name) \ HPX_REGISTER_ACTION_DECLARATION( \ hpx::lcos::base_lco_with_value::set_value_action, \ - BOOST_PP_CAT(set_value_action_, Name)) \ + HPX_PP_CAT(set_value_action_, Name)) \ HPX_REGISTER_ACTION_DECLARATION( \ hpx::lcos::base_lco_with_value::get_value_action, \ - BOOST_PP_CAT(get_value_action_, Name)) \ + HPX_PP_CAT(get_value_action_, Name)) \ HPX_ACTION_USES_MESSAGE_COALESCING_NOTHROW_DECLARATION( \ hpx::lcos::base_lco_with_value::set_value_action, \ "lco_set_value_action", std::size_t(-1), std::size_t(-1)) \ @@ -175,25 +176,25 @@ namespace hpx { namespace traits #define HPX_REGISTER_BASE_LCO_WITH_VALUE_DECLARATION2(Value, RemoteValue, Name) \ typedef hpx::lcos::base_lco_with_value \ - BOOST_PP_CAT(base_lco_with_value_, Name); \ + HPX_PP_CAT(base_lco_with_value_, Name); \ HPX_REGISTER_ACTION_DECLARATION( \ - BOOST_PP_CAT(base_lco_with_value_, Name)::set_value_action, \ - BOOST_PP_CAT(set_value_action_, Name)) \ + HPX_PP_CAT(base_lco_with_value_, Name)::set_value_action, \ + HPX_PP_CAT(set_value_action_, Name)) \ HPX_REGISTER_ACTION_DECLARATION( \ - BOOST_PP_CAT(base_lco_with_value_, Name)::get_value_action, \ - BOOST_PP_CAT(get_value_action_, Name)) \ + HPX_PP_CAT(base_lco_with_value_, Name)::get_value_action, \ + HPX_PP_CAT(get_value_action_, Name)) \ HPX_ACTION_USES_MESSAGE_COALESCING_NOTHROW_DECLARATION( \ - BOOST_PP_CAT(base_lco_with_value_, Name)::set_value_action, \ + HPX_PP_CAT(base_lco_with_value_, Name)::set_value_action, \ "lco_set_value_action", std::size_t(-1), std::size_t(-1)) \ /**/ #define HPX_REGISTER_BASE_LCO_WITH_VALUE(Value, Name) \ HPX_REGISTER_ACTION( \ hpx::lcos::base_lco_with_value::set_value_action, \ - BOOST_PP_CAT(set_value_action_, Name)) \ + HPX_PP_CAT(set_value_action_, Name)) \ HPX_REGISTER_ACTION( \ hpx::lcos::base_lco_with_value::get_value_action, \ - BOOST_PP_CAT(get_value_action_, Name)) \ + HPX_PP_CAT(get_value_action_, Name)) \ HPX_ACTION_USES_MESSAGE_COALESCING_NOTHROW_DEFINITION( \ hpx::lcos::base_lco_with_value::set_value_action, \ "lco_set_value_action", std::size_t(-1), std::size_t(-1)) \ @@ -203,10 +204,10 @@ namespace hpx { namespace traits Value, Name, ActionIdGet, ActionIdSet) \ HPX_REGISTER_ACTION_ID( \ hpx::lcos::base_lco_with_value::set_value_action, \ - BOOST_PP_CAT(set_value_action_, Name), ActionIdSet) \ + HPX_PP_CAT(set_value_action_, Name), ActionIdSet) \ HPX_REGISTER_ACTION_ID( \ hpx::lcos::base_lco_with_value::get_value_action, \ - BOOST_PP_CAT(get_value_action_, Name), ActionIdGet) \ + HPX_PP_CAT(get_value_action_, Name), ActionIdGet) \ HPX_ACTION_USES_MESSAGE_COALESCING_NOTHROW_DEFINITION( \ hpx::lcos::base_lco_with_value::set_value_action, \ "lco_set_value_action", std::size_t(-1), std::size_t(-1)) \ @@ -214,15 +215,15 @@ namespace hpx { namespace traits #define HPX_REGISTER_BASE_LCO_WITH_VALUE_ID2( \ Value, RemoteValue, Name, ActionIdGet, ActionIdSet) \ typedef hpx::lcos::base_lco_with_value \ - BOOST_PP_CAT(base_lco_with_value_, Name); \ + HPX_PP_CAT(base_lco_with_value_, Name); \ HPX_REGISTER_ACTION_ID( \ - BOOST_PP_CAT(base_lco_with_value_, Name)::set_value_action, \ - BOOST_PP_CAT(set_value_action_, Name), ActionIdSet) \ + HPX_PP_CAT(base_lco_with_value_, Name)::set_value_action, \ + HPX_PP_CAT(set_value_action_, Name), ActionIdSet) \ HPX_REGISTER_ACTION_ID( \ - BOOST_PP_CAT(base_lco_with_value_, Name)::get_value_action, \ - BOOST_PP_CAT(get_value_action_, Name), ActionIdGet) \ + HPX_PP_CAT(base_lco_with_value_, Name)::get_value_action, \ + HPX_PP_CAT(get_value_action_, Name), ActionIdGet) \ HPX_ACTION_USES_MESSAGE_COALESCING_NOTHROW_DEFINITION( \ - BOOST_PP_CAT(base_lco_with_value_, Name)::set_value_action, \ + HPX_PP_CAT(base_lco_with_value_, Name)::set_value_action, \ "lco_set_value_action", std::size_t(-1), std::size_t(-1)) \ /**/ diff --git a/hpx/lcos/broadcast.hpp b/hpx/lcos/broadcast.hpp index bc03c1d306e6..53f4cb1a90d4 100644 --- a/hpx/lcos/broadcast.hpp +++ b/hpx/lcos/broadcast.hpp @@ -146,12 +146,12 @@ namespace hpx { namespace lcos #include #include #include -#include +#include +#include +#include #include #include -#include - #include #include #include @@ -930,9 +930,9 @@ namespace hpx { namespace lcos HPX_REGISTER_BROADCAST_APPLY_ACTION_DECLARATION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_BROADCAST_APPLY_ACTION_DECLARATION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ + HPX_PP_EXPAND(HPX_PP_CAT( \ HPX_REGISTER_BROADCAST_APPLY_ACTION_DECLARATION_, \ - HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -942,11 +942,11 @@ namespace hpx { namespace lcos #define HPX_REGISTER_BROADCAST_APPLY_ACTION_DECLARATION_2(Action, Name) \ HPX_REGISTER_ACTION_DECLARATION( \ ::hpx::lcos::detail::make_broadcast_apply_action::type \ - , BOOST_PP_CAT(broadcast_apply_, Name) \ + , HPX_PP_CAT(broadcast_apply_, Name) \ ) \ HPX_REGISTER_APPLY_COLOCATED_DECLARATION( \ ::hpx::lcos::detail::make_broadcast_apply_action::type \ - , BOOST_PP_CAT(apply_colocated_broadcast_, Name) \ + , HPX_PP_CAT(apply_colocated_broadcast_, Name) \ ) \ /**/ @@ -955,8 +955,8 @@ namespace hpx { namespace lcos HPX_REGISTER_BROADCAST_APPLY_ACTION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_BROADCAST_APPLY_ACTION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_BROADCAST_APPLY_ACTION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_BROADCAST_APPLY_ACTION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -966,11 +966,11 @@ namespace hpx { namespace lcos #define HPX_REGISTER_BROADCAST_APPLY_ACTION_2(Action, Name) \ HPX_REGISTER_ACTION( \ ::hpx::lcos::detail::make_broadcast_apply_action::type \ - , BOOST_PP_CAT(broadcast_apply_, Name) \ + , HPX_PP_CAT(broadcast_apply_, Name) \ ) \ HPX_REGISTER_APPLY_COLOCATED( \ ::hpx::lcos::detail::make_broadcast_apply_action::type \ - , BOOST_PP_CAT(apply_colocated_broadcast_, Name) \ + , HPX_PP_CAT(apply_colocated_broadcast_, Name) \ ) \ /**/ @@ -979,9 +979,9 @@ namespace hpx { namespace lcos HPX_REGISTER_BROADCAST_APPLY_WITH_INDEX_ACTION_DECLARATION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_BROADCAST_APPLY_WITH_INDEX_ACTION_DECLARATION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ + HPX_PP_EXPAND(HPX_PP_CAT( \ HPX_REGISTER_BROADCAST_APPLY_WITH_INDEX_ACTION_DECLARATION_, \ - HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -995,13 +995,13 @@ namespace hpx { namespace lcos ::hpx::lcos::detail::make_broadcast_apply_action< \ ::hpx::lcos::detail::broadcast_with_index \ >::type \ - , BOOST_PP_CAT(broadcast_apply_with_index_, Name) \ + , HPX_PP_CAT(broadcast_apply_with_index_, Name) \ ) \ HPX_REGISTER_APPLY_COLOCATED_DECLARATION( \ ::hpx::lcos::detail::make_broadcast_apply_action< \ ::hpx::lcos::detail::broadcast_with_index \ >::type \ - , BOOST_PP_CAT(apply_colocated_broadcast_with_index_, Name) \ + , HPX_PP_CAT(apply_colocated_broadcast_with_index_, Name) \ ) \ /**/ @@ -1010,9 +1010,9 @@ namespace hpx { namespace lcos HPX_REGISTER_BROADCAST_APPLY_WITH_INDEX_ACTION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_BROADCAST_APPLY_WITH_INDEX_ACTION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ + HPX_PP_EXPAND(HPX_PP_CAT( \ HPX_REGISTER_BROADCAST_APPLY_WITH_INDEX_ACTION_, \ - HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -1024,13 +1024,13 @@ namespace hpx { namespace lcos ::hpx::lcos::detail::make_broadcast_apply_action< \ ::hpx::lcos::detail::broadcast_with_index \ >::type \ - , BOOST_PP_CAT(broadcast_apply_with_index_, Name) \ + , HPX_PP_CAT(broadcast_apply_with_index_, Name) \ ) \ HPX_REGISTER_APPLY_COLOCATED( \ ::hpx::lcos::detail::make_broadcast_apply_action< \ ::hpx::lcos::detail::broadcast_with_index \ >::type \ - , BOOST_PP_CAT(apply_colocated_broadcast_with_index_, Name) \ + , HPX_PP_CAT(apply_colocated_broadcast_with_index_, Name) \ ) \ /**/ @@ -1039,9 +1039,9 @@ namespace hpx { namespace lcos HPX_REGISTER_BROADCAST_ACTION_DECLARATION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_BROADCAST_ACTION_DECLARATION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ + HPX_PP_EXPAND(HPX_PP_CAT( \ HPX_REGISTER_BROADCAST_ACTION_DECLARATION_, \ - HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -1051,11 +1051,11 @@ namespace hpx { namespace lcos #define HPX_REGISTER_BROADCAST_ACTION_DECLARATION_2(Action, Name) \ HPX_REGISTER_ACTION_DECLARATION( \ ::hpx::lcos::detail::make_broadcast_action::type \ - , BOOST_PP_CAT(broadcast_, Name) \ + , HPX_PP_CAT(broadcast_, Name) \ ) \ HPX_REGISTER_ASYNC_COLOCATED_DECLARATION( \ ::hpx::lcos::detail::make_broadcast_action::type \ - , BOOST_PP_CAT(async_colocated_broadcast_, Name) \ + , HPX_PP_CAT(async_colocated_broadcast_, Name) \ ) \ /**/ @@ -1064,8 +1064,8 @@ namespace hpx { namespace lcos HPX_REGISTER_BROADCAST_ACTION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_BROADCAST_ACTION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_BROADCAST_ACTION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_BROADCAST_ACTION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -1075,22 +1075,22 @@ namespace hpx { namespace lcos #define HPX_REGISTER_BROADCAST_ACTION_2(Action, Name) \ HPX_REGISTER_ACTION( \ ::hpx::lcos::detail::make_broadcast_action::type \ - , BOOST_PP_CAT(broadcast_, Name) \ + , HPX_PP_CAT(broadcast_, Name) \ ) \ HPX_REGISTER_ASYNC_COLOCATED( \ ::hpx::lcos::detail::make_broadcast_action::type \ - , BOOST_PP_CAT(async_colocated_broadcast_, Name) \ + , HPX_PP_CAT(async_colocated_broadcast_, Name) \ ) \ /**/ #define HPX_REGISTER_BROADCAST_ACTION_ID(Action, Name, Id) \ HPX_REGISTER_ACTION_ID( \ ::hpx::lcos::detail::make_broadcast_action::type \ - , BOOST_PP_CAT(broadcast_, Name) \ + , HPX_PP_CAT(broadcast_, Name) \ , Id \ ) \ HPX_REGISTER_ASYNC_COLOCATED( \ ::hpx::lcos::detail::make_broadcast_action::type \ - , BOOST_PP_CAT(async_colocated_broadcast_, Name) \ + , HPX_PP_CAT(async_colocated_broadcast_, Name) \ ) \ /**/ @@ -1099,9 +1099,9 @@ namespace hpx { namespace lcos HPX_REGISTER_BROADCAST_WITH_INDEX_ACTION_DECLARATION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_BROADCAST_WITH_INDEX_ACTION_DECLARATION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ + HPX_PP_EXPAND(HPX_PP_CAT( \ HPX_REGISTER_BROADCAST_WITH_INDEX_ACTION_DECLARATION_, \ - HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -1113,13 +1113,13 @@ namespace hpx { namespace lcos ::hpx::lcos::detail::make_broadcast_action< \ ::hpx::lcos::detail::broadcast_with_index \ >::type \ - , BOOST_PP_CAT(broadcast_with_index_, Name) \ + , HPX_PP_CAT(broadcast_with_index_, Name) \ ) \ HPX_REGISTER_ASYNC_COLOCATED_DECLARATION( \ ::hpx::lcos::detail::make_broadcast_action< \ ::hpx::lcos::detail::broadcast_with_index \ >::type \ - , BOOST_PP_CAT(async_colocated_broadcast_with_index_, Name) \ + , HPX_PP_CAT(async_colocated_broadcast_with_index_, Name) \ ) \ /**/ @@ -1128,9 +1128,9 @@ namespace hpx { namespace lcos HPX_REGISTER_BROADCAST_WITH_INDEX_ACTION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_BROADCAST_WITH_INDEX_ACTION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ + HPX_PP_EXPAND(HPX_PP_CAT( \ HPX_REGISTER_BROADCAST_WITH_INDEX_ACTION_, \ - HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -1142,13 +1142,13 @@ namespace hpx { namespace lcos ::hpx::lcos::detail::make_broadcast_action< \ ::hpx::lcos::detail::broadcast_with_index \ >::type \ - , BOOST_PP_CAT(broadcast_with_index_, Name) \ + , HPX_PP_CAT(broadcast_with_index_, Name) \ ) \ HPX_REGISTER_ASYNC_COLOCATED( \ ::hpx::lcos::detail::make_broadcast_action< \ ::hpx::lcos::detail::broadcast_with_index \ >::type \ - , BOOST_PP_CAT(async_colocated_broadcast_with_index_, Name) \ + , HPX_PP_CAT(async_colocated_broadcast_with_index_, Name) \ ) \ /**/ #define HPX_REGISTER_BROADCAST_WITH_INDEX_ACTION_ID(Action, Name, Id) \ @@ -1156,14 +1156,14 @@ namespace hpx { namespace lcos ::hpx::lcos::detail::make_broadcast_action< \ ::hpx::lcos::detail::broadcast_with_index \ >::type \ - , BOOST_PP_CAT(broadcast_with_index_, Name) \ + , HPX_PP_CAT(broadcast_with_index_, Name) \ , Id \ ) \ HPX_REGISTER_ASYNC_COLOCATED( \ ::hpx::lcos::detail::make_broadcast_action< \ ::hpx::lcos::detail::broadcast_with_index \ >::type \ - , BOOST_PP_CAT(async_colocated_broadcast_with_index_, Name) \ + , HPX_PP_CAT(async_colocated_broadcast_with_index_, Name) \ ) \ /**/ diff --git a/hpx/lcos/fold.hpp b/hpx/lcos/fold.hpp index c434a4361bb0..1e937e7caca8 100644 --- a/hpx/lcos/fold.hpp +++ b/hpx/lcos/fold.hpp @@ -176,12 +176,12 @@ namespace hpx { namespace lcos #include #include #include -#include +#include +#include +#include #include #include -#include - #include #include #include @@ -692,8 +692,8 @@ namespace hpx { namespace lcos HPX_REGISTER_FOLD_ACTION_DECLARATION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_FOLD_ACTION_DECLARATION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_FOLD_ACTION_DECLARATION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_FOLD_ACTION_DECLARATION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -701,14 +701,14 @@ namespace hpx { namespace lcos HPX_REGISTER_ACTION_DECLARATION( \ ::hpx::lcos::detail::make_fold_action:: \ fold_invoker::type \ - , BOOST_PP_CAT(BOOST_PP_CAT(fold_, Action), FoldOp) \ + , HPX_PP_CAT(HPX_PP_CAT(fold_, Action), FoldOp) \ ) \ /**/ #define HPX_REGISTER_FOLD_ACTION_DECLARATION_3(Action, FoldOp, Name) \ HPX_REGISTER_ACTION_DECLARATION( \ ::hpx::lcos::detail::make_fold_action:: \ fold_invoker::type \ - , BOOST_PP_CAT(fold_, Name) \ + , HPX_PP_CAT(fold_, Name) \ ) \ /**/ @@ -717,8 +717,8 @@ namespace hpx { namespace lcos HPX_REGISTER_FOLD_ACTION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_FOLD_ACTION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_FOLD_ACTION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_FOLD_ACTION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -726,14 +726,14 @@ namespace hpx { namespace lcos HPX_REGISTER_ACTION( \ ::hpx::lcos::detail::make_fold_action:: \ fold_invoker::type \ - , BOOST_PP_CAT(BOOST_PP_CAT(fold_, Action), FoldOp) \ + , HPX_PP_CAT(HPX_PP_CAT(fold_, Action), FoldOp) \ ) \ /**/ #define HPX_REGISTER_FOLD_ACTION_3(Action, FoldOp, Name) \ HPX_REGISTER_ACTION( \ ::hpx::lcos::detail::make_fold_action:: \ fold_invoker::type \ - , BOOST_PP_CAT(fold_, Name) \ + , HPX_PP_CAT(fold_, Name) \ ) \ /**/ @@ -742,9 +742,9 @@ namespace hpx { namespace lcos HPX_REGISTER_FOLD_WITH_INDEX_ACTION_DECLARATION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_FOLD_WITH_INDEX_ACTION_DECLARATION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ + HPX_PP_EXPAND(HPX_PP_CAT( \ HPX_REGISTER_FOLD_WITH_INDEX_ACTION_DECLARATION_, \ - HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -753,7 +753,7 @@ namespace hpx { namespace lcos ::hpx::lcos::detail::make_fold_action< \ ::hpx::lcos::detail::fold_with_index \ >::fold_invoker::type \ - , BOOST_PP_CAT(BOOST_PP_CAT(fold_, Action), FoldOp) \ + , HPX_PP_CAT(HPX_PP_CAT(fold_, Action), FoldOp) \ ) \ /**/ #define HPX_REGISTER_FOLD_WITH_INDEX_ACTION_DECLARATION_3(Action, FoldOp, Name) \ @@ -761,7 +761,7 @@ namespace hpx { namespace lcos ::hpx::lcos::detail::make_fold_action< \ ::hpx::lcos::detail::fold_with_index \ >::fold_invoker::type \ - , BOOST_PP_CAT(fold_, Name) \ + , HPX_PP_CAT(fold_, Name) \ ) \ /**/ @@ -770,8 +770,8 @@ namespace hpx { namespace lcos HPX_REGISTER_FOLD_WITH_INDEX_ACTION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_FOLD_WITH_INDEX_ACTION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_FOLD_WITH_INDEX_ACTION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_FOLD_WITH_INDEX_ACTION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -780,7 +780,7 @@ namespace hpx { namespace lcos ::hpx::lcos::detail::make_fold_action< \ ::hpx::lcos::detail::fold_with_index \ >::fold_invoker::type \ - , BOOST_PP_CAT(BOOST_PP_CAT(fold_, Action), FoldOp) \ + , HPX_PP_CAT(HPX_PP_CAT(fold_, Action), FoldOp) \ ) \ /**/ #define HPX_REGISTER_FOLD_WITH_INDEX_ACTION_3(Action, FoldOp, Name) \ @@ -788,7 +788,7 @@ namespace hpx { namespace lcos ::hpx::lcos::detail::make_fold_action< \ ::hpx::lcos::detail::fold_with_index \ >::fold_invoker::type \ - , BOOST_PP_CAT(fold_, Name) \ + , HPX_PP_CAT(fold_, Name) \ ) \ /**/ diff --git a/hpx/lcos/gather.hpp b/hpx/lcos/gather.hpp index 139ff0c77bce..5a4f3d46d72b 100644 --- a/hpx/lcos/gather.hpp +++ b/hpx/lcos/gather.hpp @@ -204,11 +204,11 @@ namespace hpx { namespace lcos #include #include #include -#include +#include +#include +#include #include -#include - #include #include #include @@ -510,22 +510,22 @@ namespace hpx { namespace lcos /**/ #define HPX_REGISTER_GATHER_DECLARATION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_GATHER_DECLARATION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_GATHER_DECLARATION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ #define HPX_REGISTER_GATHER_DECLARATION_1(type) \ - HPX_REGISTER_GATHER_DECLARATION_2(type, BOOST_PP_CAT(type, _gather)) \ + HPX_REGISTER_GATHER_DECLARATION_2(type, HPX_PP_CAT(type, _gather)) \ /**/ #define HPX_REGISTER_GATHER_DECLARATION_2(type, name) \ HPX_REGISTER_ACTION_DECLARATION( \ hpx::lcos::detail::gather_server::get_result_action, \ - BOOST_PP_CAT(gather_get_result_action_, name)); \ + HPX_PP_CAT(gather_get_result_action_, name)); \ HPX_REGISTER_ACTION_DECLARATION( \ hpx::lcos::detail::gather_server::set_result_action, \ - BOOST_PP_CAT(set_result_action_, name)) \ + HPX_PP_CAT(set_result_action_, name)) \ /**/ /////////////////////////////////////////////////////////////////////////////// @@ -534,26 +534,26 @@ namespace hpx { namespace lcos /**/ #define HPX_REGISTER_GATHER_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_GATHER_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_GATHER_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ #define HPX_REGISTER_GATHER_1(type) \ - HPX_REGISTER_GATHER_2(type, BOOST_PP_CAT(type, _gather)) \ + HPX_REGISTER_GATHER_2(type, HPX_PP_CAT(type, _gather)) \ /**/ #define HPX_REGISTER_GATHER_2(type, name) \ HPX_REGISTER_ACTION( \ hpx::lcos::detail::gather_server::get_result_action, \ - BOOST_PP_CAT(gather_get_result_action_, name)); \ + HPX_PP_CAT(gather_get_result_action_, name)); \ HPX_REGISTER_ACTION( \ hpx::lcos::detail::gather_server::set_result_action, \ - BOOST_PP_CAT(set_result_action_, name)); \ + HPX_PP_CAT(set_result_action_, name)); \ typedef hpx::components::simple_component< \ hpx::lcos::detail::gather_server \ - > BOOST_PP_CAT(gather_, name); \ - HPX_REGISTER_COMPONENT(BOOST_PP_CAT(gather_, name)) \ + > HPX_PP_CAT(gather_, name); \ + HPX_REGISTER_COMPONENT(HPX_PP_CAT(gather_, name)) \ /**/ #endif // DOXYGEN diff --git a/hpx/lcos/reduce.hpp b/hpx/lcos/reduce.hpp index 45b0830a5ba3..a381aa2ade88 100644 --- a/hpx/lcos/reduce.hpp +++ b/hpx/lcos/reduce.hpp @@ -89,12 +89,12 @@ namespace hpx { namespace lcos #include #include #include -#include +#include +#include +#include #include #include -#include - #include #include #include @@ -480,8 +480,8 @@ namespace hpx { namespace lcos HPX_REGISTER_REDUCE_ACTION_DECLARATION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_REDUCE_ACTION_DECLARATION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_REDUCE_ACTION_DECLARATION_, HPX_UTIL_PP_NARG(__VA_ARGS__)\ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_REDUCE_ACTION_DECLARATION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -489,14 +489,14 @@ namespace hpx { namespace lcos HPX_REGISTER_ACTION_DECLARATION( \ ::hpx::lcos::detail::make_reduce_action:: \ reduce_invoker::type \ - , BOOST_PP_CAT(BOOST_PP_CAT(reduce_, Action), ReduceOp) \ + , HPX_PP_CAT(HPX_PP_CAT(reduce_, Action), ReduceOp) \ ) \ /**/ #define HPX_REGISTER_REDUCE_ACTION_DECLARATION_3(Action, ReduceOp, Name) \ HPX_REGISTER_ACTION_DECLARATION( \ ::hpx::lcos::detail::make_reduce_action:: \ reduce_invoker::type \ - , BOOST_PP_CAT(reduce_, Name) \ + , HPX_PP_CAT(reduce_, Name) \ ) \ /**/ @@ -505,8 +505,8 @@ namespace hpx { namespace lcos HPX_REGISTER_REDUCE_ACTION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_REDUCE_ACTION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_REDUCE_ACTION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_REDUCE_ACTION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -514,14 +514,14 @@ namespace hpx { namespace lcos HPX_REGISTER_ACTION( \ ::hpx::lcos::detail::make_reduce_action:: \ reduce_invoker::type \ - , BOOST_PP_CAT(BOOST_PP_CAT(reduce_, Action), ReduceOp) \ + , HPX_PP_CAT(HPX_PP_CAT(reduce_, Action), ReduceOp) \ ) \ /**/ #define HPX_REGISTER_REDUCE_ACTION_3(Action, ReduceOp, Name) \ HPX_REGISTER_ACTION( \ ::hpx::lcos::detail::make_reduce_action:: \ reduce_invoker::type \ - , BOOST_PP_CAT(reduce_, Name) \ + , HPX_PP_CAT(reduce_, Name) \ ) \ /**/ @@ -530,9 +530,9 @@ namespace hpx { namespace lcos HPX_REGISTER_REDUCE_WITH_INDEX_ACTION_DECLARATION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_REDUCE_WITH_INDEX_ACTION_DECLARATION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ + HPX_PP_EXPAND(HPX_PP_CAT( \ HPX_REGISTER_REDUCE_WITH_INDEX_ACTION_DECLARATION_, \ - HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -541,7 +541,7 @@ namespace hpx { namespace lcos ::hpx::lcos::detail::make_reduce_action< \ ::hpx::lcos::detail::reduce_with_index \ >::reduce_invoker::type \ - , BOOST_PP_CAT(BOOST_PP_CAT(reduce_, Action), ReduceOp) \ + , HPX_PP_CAT(HPX_PP_CAT(reduce_, Action), ReduceOp) \ ) \ /**/ #define HPX_REGISTER_REDUCE_WITH_INDEX_ACTION_DECLARATION_3(Action, ReduceOp, Name) \ @@ -549,7 +549,7 @@ namespace hpx { namespace lcos ::hpx::lcos::detail::make_reduce_action< \ ::hpx::lcos::detail::reduce_with_index \ >::reduce_invoker::type \ - , BOOST_PP_CAT(reduce_, Name) \ + , HPX_PP_CAT(reduce_, Name) \ ) \ /**/ @@ -558,8 +558,8 @@ namespace hpx { namespace lcos HPX_REGISTER_REDUCE_WITH_INDEX_ACTION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_REDUCE_WITH_INDEX_ACTION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_REDUCE_WITH_INDEX_ACTION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_REDUCE_WITH_INDEX_ACTION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -568,7 +568,7 @@ namespace hpx { namespace lcos ::hpx::lcos::detail::make_reduce_action< \ ::hpx::lcos::detail::reduce_with_index \ >::reduce_invoker::type \ - , BOOST_PP_CAT(BOOST_PP_CAT(reduce_, Action), ReduceOp) \ + , HPX_PP_CAT(HPX_PP_CAT(reduce_, Action), ReduceOp) \ ) \ /**/ #define HPX_REGISTER_REDUCE_WITH_INDEX_ACTION_3(Action, ReduceOp, Name) \ @@ -576,7 +576,7 @@ namespace hpx { namespace lcos ::hpx::lcos::detail::make_reduce_action< \ ::hpx::lcos::detail::reduce_with_index \ >::reduce_invoker::type \ - , BOOST_PP_CAT(reduce_, Name) \ + , HPX_PP_CAT(reduce_, Name) \ ) \ /**/ diff --git a/hpx/lcos/server/channel.hpp b/hpx/lcos/server/channel.hpp index f144683cb54b..747faf667cf8 100644 --- a/hpx/lcos/server/channel.hpp +++ b/hpx/lcos/server/channel.hpp @@ -14,6 +14,10 @@ #include #include #include +#include +#include +#include +#include #include #include @@ -111,8 +115,8 @@ namespace hpx { namespace lcos { namespace server HPX_REGISTER_CHANNEL_DECLARATION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_CHANNEL_DECLARATION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_CHANNEL_DECLARATION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_CHANNEL_DECLARATION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -121,27 +125,27 @@ namespace hpx { namespace lcos { namespace server /**/ #define HPX_REGISTER_CHANNEL_DECLARATION_2(type, name) \ typedef ::hpx::lcos::server::channel \ - BOOST_PP_CAT(__channel_, BOOST_PP_CAT(type, name)); \ + HPX_PP_CAT(__channel_, HPX_PP_CAT(type, name)); \ HPX_REGISTER_ACTION_DECLARATION( \ hpx::lcos::server::channel::get_generation_action, \ - BOOST_PP_CAT(__channel_get_generation_action, \ - BOOST_PP_CAT(type, name))); \ + HPX_PP_CAT(__channel_get_generation_action, \ + HPX_PP_CAT(type, name))); \ HPX_REGISTER_ACTION_DECLARATION( \ hpx::lcos::server::channel::set_generation_action, \ - BOOST_PP_CAT(__channel_set_generation_action, \ - BOOST_PP_CAT(type, name))); \ + HPX_PP_CAT(__channel_set_generation_action, \ + HPX_PP_CAT(type, name))); \ HPX_REGISTER_ACTION_DECLARATION( \ hpx::lcos::server::channel::close_action, \ - BOOST_PP_CAT(__channel_close_action, \ - BOOST_PP_CAT(type, name))) \ + HPX_PP_CAT(__channel_close_action, \ + HPX_PP_CAT(type, name))) \ /**/ #define HPX_REGISTER_CHANNEL(...) \ HPX_REGISTER_CHANNEL_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_CHANNEL_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_CHANNEL_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_CHANNEL_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -150,26 +154,26 @@ namespace hpx { namespace lcos { namespace server /**/ #define HPX_REGISTER_CHANNEL_2(type, name) \ typedef ::hpx::lcos::server::channel \ - BOOST_PP_CAT(__channel_, BOOST_PP_CAT(type, name)); \ + HPX_PP_CAT(__channel_, HPX_PP_CAT(type, name)); \ typedef ::hpx::components::managed_component< \ - BOOST_PP_CAT(__channel_, BOOST_PP_CAT(type, name)) \ - > BOOST_PP_CAT(__channel_component_, name); \ + HPX_PP_CAT(__channel_, HPX_PP_CAT(type, name)) \ + > HPX_PP_CAT(__channel_component_, name); \ HPX_REGISTER_DERIVED_COMPONENT_FACTORY( \ - BOOST_PP_CAT(__channel_component_, name), \ - BOOST_PP_CAT(__channel_component_, name), \ - BOOST_PP_STRINGIZE(BOOST_PP_CAT(__base_lco_with_value_channel_, name)));\ + HPX_PP_CAT(__channel_component_, name), \ + HPX_PP_CAT(__channel_component_, name), \ + HPX_PP_STRINGIZE(HPX_PP_CAT(__base_lco_with_value_channel_, name))); \ HPX_REGISTER_ACTION( \ hpx::lcos::server::channel::get_generation_action, \ - BOOST_PP_CAT(__channel_get_generation_action, \ - BOOST_PP_CAT(type, name))); \ + HPX_PP_CAT(__channel_get_generation_action, \ + HPX_PP_CAT(type, name))); \ HPX_REGISTER_ACTION( \ hpx::lcos::server::channel::set_generation_action, \ - BOOST_PP_CAT(__channel_set_generation_action, \ - BOOST_PP_CAT(type, name))); \ + HPX_PP_CAT(__channel_set_generation_action, \ + HPX_PP_CAT(type, name))); \ HPX_REGISTER_ACTION( \ hpx::lcos::server::channel::close_action, \ - BOOST_PP_CAT(__channel_close_action, \ - BOOST_PP_CAT(type, name))) \ + HPX_PP_CAT(__channel_close_action, \ + HPX_PP_CAT(type, name))) \ /**/ #endif diff --git a/hpx/lcos/server/queue.hpp b/hpx/lcos/server/queue.hpp index e8f66a4c6b29..cef649cb825c 100644 --- a/hpx/lcos/server/queue.hpp +++ b/hpx/lcos/server/queue.hpp @@ -18,7 +18,10 @@ #include #include #include -#include +#include +#include +#include +#include #include #include @@ -160,8 +163,8 @@ namespace hpx { namespace lcos { namespace server HPX_REGISTER_QUEUE_DECLARATION_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_QUEUE_DECLARATION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_QUEUE_DECLARATION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_QUEUE_DECLARATION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -170,15 +173,15 @@ namespace hpx { namespace lcos { namespace server /**/ #define HPX_REGISTER_QUEUE_DECLARATION_2(type, name) \ typedef ::hpx::lcos::server::queue \ - BOOST_PP_CAT(__queue_, BOOST_PP_CAT(type, name)); \ + HPX_PP_CAT(__queue_, HPX_PP_CAT(type, name)); \ /**/ #define HPX_REGISTER_QUEUE(...) \ HPX_REGISTER_QUEUE_(__VA_ARGS__) \ /**/ #define HPX_REGISTER_QUEUE_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_QUEUE_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_QUEUE_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -187,14 +190,14 @@ namespace hpx { namespace lcos { namespace server /**/ #define HPX_REGISTER_QUEUE_2(type, name) \ typedef ::hpx::lcos::server::queue \ - BOOST_PP_CAT(__queue_, BOOST_PP_CAT(type, name)); \ + HPX_PP_CAT(__queue_, HPX_PP_CAT(type, name)); \ typedef ::hpx::components::managed_component< \ - BOOST_PP_CAT(__queue_, BOOST_PP_CAT(type, name)) \ - > BOOST_PP_CAT(__queue_component_, name); \ + HPX_PP_CAT(__queue_, HPX_PP_CAT(type, name)) \ + > HPX_PP_CAT(__queue_component_, name); \ HPX_REGISTER_DERIVED_COMPONENT_FACTORY( \ - BOOST_PP_CAT(__queue_component_, name), \ - BOOST_PP_CAT(__queue_component_, name), \ - BOOST_PP_STRINGIZE(BOOST_PP_CAT(__base_lco_with_value_queue_, name))) \ + HPX_PP_CAT(__queue_component_, name), \ + HPX_PP_CAT(__queue_component_, name), \ + HPX_PP_STRINGIZE(HPX_PP_CAT(__base_lco_with_value_queue_, name))) \ /**/ #endif diff --git a/hpx/lcos/wait_any.hpp b/hpx/lcos/wait_any.hpp index 58cd28ad8a05..3140a67878ee 100644 --- a/hpx/lcos/wait_any.hpp +++ b/hpx/lcos/wait_any.hpp @@ -166,7 +166,7 @@ namespace hpx #include #include #include -#include +#include #include #include diff --git a/hpx/lcos/wait_some.hpp b/hpx/lcos/wait_some.hpp index cea57b3d397d..c1ce315f3373 100644 --- a/hpx/lcos/wait_some.hpp +++ b/hpx/lcos/wait_some.hpp @@ -185,7 +185,7 @@ namespace hpx #include #include #include -#include +#include #include #include diff --git a/hpx/parallel/executors/executor_parameters.hpp b/hpx/parallel/executors/executor_parameters.hpp index 443e00d6260d..c805ce5ef8d0 100644 --- a/hpx/parallel/executors/executor_parameters.hpp +++ b/hpx/parallel/executors/executor_parameters.hpp @@ -16,9 +16,9 @@ #include #include #include +#include +#include -#include -#include #include #include @@ -282,11 +282,11 @@ namespace hpx { namespace parallel { inline namespace v3 #define HPX_STATIC_ASSERT_ON_PARAMETERS_AMBIGUITY(func) \ static_assert( \ parameters_type_counter< \ - BOOST_PP_CAT(hpx::parallel::v3::detail::has_, func)< \ + HPX_PP_CAT(hpx::parallel::v3::detail::has_, func)< \ typename hpx::util::decay_unwrap::type>::value... \ >::value <= 1, \ "Passing more than one executor parameters type exposing " \ - BOOST_PP_STRINGIZE(func) " is not possible") \ + HPX_PP_STRINGIZE(func) " is not possible") \ /**/ template diff --git a/hpx/parallel/traits/detail/boost_simd/vector_pack_alignment_size.hpp b/hpx/parallel/traits/detail/boost_simd/vector_pack_alignment_size.hpp index b8c2f08fd772..4d175118d752 100644 --- a/hpx/parallel/traits/detail/boost_simd/vector_pack_alignment_size.hpp +++ b/hpx/parallel/traits/detail/boost_simd/vector_pack_alignment_size.hpp @@ -3,8 +3,8 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#if !defined(HPX_PARALLEL_TRAITS_VECTOR_PACK_ALIGNMENT_SIZE_BOOST_SIMD_SEP_29_2016_0905PM) -#define HPX_PARALLEL_TRAITS_VECTOR_PACK_ALIGNMENT_SIZE_BOOST_SIMD_SEP_29_2016_0905PM +#if !defined(HPX_PARALLEL_VECTOR_PACK_ALIGNMENT_SIZE_BOOST_SIMD_SEP_29_2016_0905PM) +#define HPX_PARALLEL_VECTOR_PACK_ALIGNMENT_SIZE_BOOST_SIMD_SEP_29_2016_0905PM #include diff --git a/hpx/plugins/binary_filter_factory.hpp b/hpx/plugins/binary_filter_factory.hpp index 3cb2abd5af2a..8937117e767d 100644 --- a/hpx/plugins/binary_filter_factory.hpp +++ b/hpx/plugins/binary_filter_factory.hpp @@ -10,11 +10,9 @@ #include #include #include - -#include - -#include -#include +#include +#include +#include /////////////////////////////////////////////////////////////////////////////// namespace hpx { namespace plugins diff --git a/hpx/plugins/message_handler_factory.hpp b/hpx/plugins/message_handler_factory.hpp index 32f387c14ed8..7641c537cabf 100644 --- a/hpx/plugins/message_handler_factory.hpp +++ b/hpx/plugins/message_handler_factory.hpp @@ -10,11 +10,9 @@ #include #include #include - -#include - -#include -#include +#include +#include +#include #include diff --git a/hpx/plugins/parcel/coalescing_message_handler.hpp b/hpx/plugins/parcel/coalescing_message_handler.hpp index 04639e20cb84..08b02889a8bf 100644 --- a/hpx/plugins/parcel/coalescing_message_handler.hpp +++ b/hpx/plugins/parcel/coalescing_message_handler.hpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include diff --git a/hpx/plugins/parcel/coalescing_message_handler_registration.hpp b/hpx/plugins/parcel/coalescing_message_handler_registration.hpp index 7f9ab68d7943..588f4ec069d8 100644 --- a/hpx/plugins/parcel/coalescing_message_handler_registration.hpp +++ b/hpx/plugins/parcel/coalescing_message_handler_registration.hpp @@ -16,9 +16,11 @@ #include #include #include - -#include -#include +#include +#include +#include +#include +#include #include @@ -69,26 +71,26 @@ namespace hpx { namespace parcelset /**/ #define HPX_ACTION_USES_MESSAGE_COALESCING_DECLARATION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ + HPX_PP_EXPAND(HPX_PP_CAT( \ HPX_ACTION_USES_MESSAGE_COALESCING_DECLARATION_, \ - HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ #define HPX_ACTION_USES_MESSAGE_COALESCING_DECLARATION_1(action_type) \ HPX_ACTION_USES_MESSAGE_COALESCING_DECLARATION_4(action_type, \ - BOOST_PP_STRINGIZE(action_type), std::size_t(-1), std::size_t(-1)) \ + HPX_PP_STRINGIZE(action_type), std::size_t(-1), std::size_t(-1)) \ /**/ #define HPX_ACTION_USES_MESSAGE_COALESCING_DECLARATION_2(action_type, num) \ HPX_ACTION_USES_MESSAGE_COALESCING_DECLARATION_3(action_type, \ - BOOST_PP_STRINGIZE(action_type), num, std::size_t(-1)) \ + HPX_PP_STRINGIZE(action_type), num, std::size_t(-1)) \ /**/ #define HPX_ACTION_USES_MESSAGE_COALESCING_DECLARATION_3( \ action_type, num, interval) \ HPX_ACTION_USES_MESSAGE_COALESCING_DECLARATION_3(action_type, \ - BOOST_PP_STRINGIZE(action_type), num, interval) \ + HPX_PP_STRINGIZE(action_type), num, interval) \ /**/ #define HPX_ACTION_USES_MESSAGE_COALESCING_DECLARATION_4( \ @@ -115,26 +117,26 @@ namespace hpx { namespace parcelset /**/ #define HPX_ACTION_USES_MESSAGE_COALESCING_DEFINITION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ + HPX_PP_EXPAND(HPX_PP_CAT( \ HPX_ACTION_USES_MESSAGE_COALESCING_DEFINITION_, \ - HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ #define HPX_ACTION_USES_MESSAGE_COALESCING_DEFINITION_1(action_type) \ HPX_ACTION_USES_MESSAGE_COALESCING_DEFINITION_4(action_type, \ - BOOST_PP_STRINGIZE(action_type), std::size_t(-1), std::size_t(-1)) \ + HPX_PP_STRINGIZE(action_type), std::size_t(-1), std::size_t(-1)) \ /**/ #define HPX_ACTION_USES_MESSAGE_COALESCING_DEFINITION_2(action_type, num) \ HPX_ACTION_USES_MESSAGE_COALESCING_DEFINITION_3(action_type, \ - BOOST_PP_STRINGIZE(action_type), num, std::size_t(-1)) \ + HPX_PP_STRINGIZE(action_type), num, std::size_t(-1)) \ /**/ #define HPX_ACTION_USES_MESSAGE_COALESCING_DEFINITION_3( \ action_type, num, interval) \ HPX_ACTION_USES_MESSAGE_COALESCING_DEFINITION_3(action_type, \ - BOOST_PP_STRINGIZE(action_type), num, interval) \ + HPX_PP_STRINGIZE(action_type), num, interval) \ /**/ #define HPX_ACTION_USES_MESSAGE_COALESCING_DEFINITION_4( \ diff --git a/hpx/plugins/parcelport_factory.hpp b/hpx/plugins/parcelport_factory.hpp index 0877d1599fc4..9004872059b3 100644 --- a/hpx/plugins/parcelport_factory.hpp +++ b/hpx/plugins/parcelport_factory.hpp @@ -15,13 +15,13 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include @@ -147,22 +147,22 @@ namespace hpx { namespace plugins /// Hpx.Plugin. #define HPX_REGISTER_PARCELPORT_(Parcelport, pluginname, pp) \ typedef hpx::plugins::parcelport_factory \ - BOOST_PP_CAT(pluginname, _plugin_factory_type); \ + HPX_PP_CAT(pluginname, _plugin_factory_type); \ HPX_DEF_UNIQUE_PLUGIN_NAME( \ - BOOST_PP_CAT(pluginname, _plugin_factory_type), pp) \ + HPX_PP_CAT(pluginname, _plugin_factory_type), pp) \ template struct hpx::plugins::parcelport_factory; \ HPX_EXPORT hpx::plugins::parcelport_factory_base* \ - BOOST_PP_CAT(pluginname, _factory_init) \ + HPX_PP_CAT(pluginname, _factory_init) \ (std::vector& factories) \ { \ - static BOOST_PP_CAT(pluginname, _plugin_factory_type) factory(factories);\ + static HPX_PP_CAT(pluginname, _plugin_factory_type) factory(factories);\ return &factory; \ } \ /**/ #define HPX_REGISTER_PARCELPORT(Parcelport, pluginname) \ HPX_REGISTER_PARCELPORT_(Parcelport, \ - BOOST_PP_CAT(parcelport_, pluginname), pluginname) \ + HPX_PP_CAT(parcelport_, pluginname), pluginname) \ #endif diff --git a/hpx/plugins/plugin_registry.hpp b/hpx/plugins/plugin_registry.hpp index 3186f01a34a2..a374654dc0be 100644 --- a/hpx/plugins/plugin_registry.hpp +++ b/hpx/plugins/plugin_registry.hpp @@ -12,7 +12,10 @@ #include #include -#include +#include +#include +#include +#include #include #include @@ -21,8 +24,6 @@ #include #include #include -#include -#include #include #include @@ -83,8 +84,8 @@ namespace hpx { namespace plugins /**/ #define HPX_REGISTER_PLUGIN_REGISTRY_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_PLUGIN_REGISTRY_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_PLUGIN_REGISTRY_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ diff --git a/hpx/plugins/unique_plugin_name.hpp b/hpx/plugins/unique_plugin_name.hpp index 6a073bf4eb21..007c85a46c40 100644 --- a/hpx/plugins/unique_plugin_name.hpp +++ b/hpx/plugins/unique_plugin_name.hpp @@ -7,7 +7,7 @@ #if !defined(HPX_UNIQUE_PLUGIN_NAME_MAR_24_2013_245PM) #define HPX_UNIQUE_PLUGIN_NAME_MAR_24_2013_245PM -#include +#include namespace hpx { namespace plugins { @@ -28,7 +28,7 @@ namespace hpx { namespace plugins \ static type call (void) \ { \ - return BOOST_PP_STRINGIZE(name); \ + return HPX_PP_STRINGIZE(name); \ } \ }; \ }} \ diff --git a/hpx/runtime/actions/action_support.hpp b/hpx/runtime/actions/action_support.hpp index ef4dab325a00..31ee876f218b 100644 --- a/hpx/runtime/actions/action_support.hpp +++ b/hpx/runtime/actions/action_support.hpp @@ -22,14 +22,13 @@ #include #include #include -#include +#include +#include #include #if HPX_HAVE_ITTNOTIFY != 0 && !defined(HPX_HAVE_APEX) #include #endif -#include - #include #include #include diff --git a/hpx/runtime/actions/basic_action.hpp b/hpx/runtime/actions/basic_action.hpp index f5033a57de01..ba6ff3af778b 100644 --- a/hpx/runtime/actions/basic_action.hpp +++ b/hpx/runtime/actions/basic_action.hpp @@ -35,7 +35,10 @@ #include #include #include -#include +#include +#include +#include +#include #include #include #include @@ -46,8 +49,6 @@ #endif #include -#include -#include #include #include @@ -813,13 +814,13 @@ namespace hpx { namespace serialization /**/ #define HPX_DECLARE_ACTION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_DECLARE_ACTION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_DECLARE_ACTION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ #define HPX_DECLARE_ACTION_1(func) \ - HPX_DECLARE_ACTION_2(func, BOOST_PP_CAT(func, _action)) \ + HPX_DECLARE_ACTION_2(func, HPX_PP_CAT(func, _action)) \ /**/ #define HPX_DECLARE_ACTION_2(func, name) struct name; \ @@ -837,7 +838,7 @@ namespace hpx { namespace serialization template<> HPX_ALWAYS_EXPORT \ util::itt::string_handle const& get_action_name_itt< action>() \ { \ - static util::itt::string_handle sh(BOOST_PP_STRINGIZE(actionname)); \ + static util::itt::string_handle sh(HPX_PP_STRINGIZE(actionname)); \ return sh; \ } \ }}} \ @@ -852,14 +853,14 @@ namespace hpx { namespace serialization template<> HPX_ALWAYS_EXPORT \ char const* get_action_name< action>() \ { \ - return BOOST_PP_STRINGIZE(actionname); \ + return HPX_PP_STRINGIZE(actionname); \ } \ }}} \ /**/ #define HPX_REGISTER_ACTION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_ACTION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_ACTION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ #define HPX_REGISTER_ACTION_1(action) \ @@ -920,8 +921,8 @@ namespace hpx { namespace serialization /**/ #define HPX_REGISTER_ACTION_DECLARATION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_ACTION_DECLARATION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_ACTION_DECLARATION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ #define HPX_REGISTER_ACTION_DECLARATION_1(action) \ @@ -957,14 +958,14 @@ namespace hpx { namespace serialization /**/ // This macro is deprecated. It expands to an inline function which will emit a // warning. -#define HPX_ACTION_DOES_NOT_SUSPEND(action) \ - HPX_DEPRECATED("HPX_ACTION_DOES_NOT_SUSPEND is deprecated and will be " \ - "removed in the next release") \ - static inline void BOOST_PP_CAT(HPX_ACTION_DOES_NOT_SUSPEND_, action)(); \ - void BOOST_PP_CAT(HPX_ACTION_DOES_NOT_SUSPEND_, action)() \ - { \ - BOOST_PP_CAT(HPX_ACTION_DOES_NOT_SUSPEND_, action)(); \ - } \ +#define HPX_ACTION_DOES_NOT_SUSPEND(action) \ + HPX_DEPRECATED("HPX_ACTION_DOES_NOT_SUSPEND is deprecated and will be " \ + "removed in the next release") \ + static inline void HPX_PP_CAT(HPX_ACTION_DOES_NOT_SUSPEND_, action)(); \ + void HPX_PP_CAT(HPX_ACTION_DOES_NOT_SUSPEND_, action)() \ + { \ + HPX_PP_CAT(HPX_ACTION_DOES_NOT_SUSPEND_, action)(); \ + } \ /**/ /////////////////////////////////////////////////////////////////////////////// diff --git a/hpx/runtime/actions/component_action.hpp b/hpx/runtime/actions/component_action.hpp index 012991670471..6b65fda24773 100644 --- a/hpx/runtime/actions/component_action.hpp +++ b/hpx/runtime/actions/component_action.hpp @@ -13,12 +13,12 @@ #include #include #include -#include -#include +#include +#include +#include +#include #include -#include - #include #include #include @@ -157,8 +157,8 @@ namespace hpx { namespace actions /// \cond NOINTERNAL #define HPX_DEFINE_COMPONENT_ACTION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_DEFINE_COMPONENT_ACTION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_DEFINE_COMPONENT_ACTION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -168,7 +168,7 @@ namespace hpx { namespace actions /**/ #define HPX_DEFINE_COMPONENT_ACTION_2(component, func) \ HPX_DEFINE_COMPONENT_ACTION_3(component, func, \ - BOOST_PP_CAT(func, _action)) \ + HPX_PP_CAT(func, _action)) \ /**/ /// \endcond @@ -178,9 +178,9 @@ namespace hpx { namespace actions /**/ #define HPX_DEFINE_COMPONENT_DIRECT_ACTION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ + HPX_PP_EXPAND(HPX_PP_CAT( \ HPX_DEFINE_COMPONENT_DIRECT_ACTION_, \ - HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -191,7 +191,7 @@ namespace hpx { namespace actions #define HPX_DEFINE_COMPONENT_DIRECT_ACTION_2(component, func) \ HPX_DEFINE_COMPONENT_DIRECT_ACTION_3(component, func, \ - BOOST_PP_CAT(func, _action)) \ + HPX_PP_CAT(func, _action)) \ /**/ /// \endcond diff --git a/hpx/runtime/actions/continuation.hpp b/hpx/runtime/actions/continuation.hpp index 47f8f0c51e69..d915f3b7f163 100644 --- a/hpx/runtime/actions/continuation.hpp +++ b/hpx/runtime/actions/continuation.hpp @@ -24,11 +24,10 @@ #include #include #include +#include #include #include -#include - #include #include #include diff --git a/hpx/runtime/actions/detail/action_factory.hpp b/hpx/runtime/actions/detail/action_factory.hpp index e3b133741b9e..472c172063f6 100644 --- a/hpx/runtime/actions/detail/action_factory.hpp +++ b/hpx/runtime/actions/detail/action_factory.hpp @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -32,8 +33,10 @@ namespace hpx { namespace actions { namespace detail HPX_STATIC_CONSTEXPR std::uint32_t invalid_id = ~0; HPX_EXPORT action_registry(); - HPX_EXPORT void register_factory(std::string const& type_name, ctor_t ctor); - HPX_EXPORT void register_typename(std::string const& type_name, std::uint32_t id); + HPX_EXPORT void register_factory(std::string const& type_name, + ctor_t ctor); + HPX_EXPORT void register_typename(std::string const& type_name, + std::uint32_t id); HPX_EXPORT void fill_missing_typenames(); HPX_EXPORT std::uint32_t try_get_id(std::string const& type_name) const; HPX_EXPORT std::vector get_unassigned_typenames() const; @@ -118,14 +121,14 @@ namespace hpx { namespace actions { namespace detail } }}} -#define HPX_REGISTER_ACTION_FACTORY_ID(Name, Id) \ - namespace hpx { namespace actions { namespace detail { \ - template <> HPX_ALWAYS_EXPORT std::string get_action_name_id< Id>() \ - { \ - return BOOST_PP_STRINGIZE(Name); \ - } \ - template add_constant_entry< Id> add_constant_entry< Id>::instance; \ - }}} \ +#define HPX_REGISTER_ACTION_FACTORY_ID(Name, Id) \ + namespace hpx { namespace actions { namespace detail { \ + template <> HPX_ALWAYS_EXPORT std::string get_action_name_id< Id>() \ + { \ + return HPX_PP_STRINGIZE(Name); \ + } \ + template add_constant_entry< Id> add_constant_entry< Id>::instance; \ + }}} \ /**/ #endif diff --git a/hpx/runtime/actions/detail/invocation_count_registry.hpp b/hpx/runtime/actions/detail/invocation_count_registry.hpp index bc8cf9e9256d..a2ac88f297a8 100644 --- a/hpx/runtime/actions/detail/invocation_count_registry.hpp +++ b/hpx/runtime/actions/detail/invocation_count_registry.hpp @@ -8,12 +8,11 @@ #include #include - +#include #include #include #include -#include #include #include diff --git a/hpx/runtime/actions/plain_action.hpp b/hpx/runtime/actions/plain_action.hpp index d46313c10f16..953a676e3702 100644 --- a/hpx/runtime/actions/plain_action.hpp +++ b/hpx/runtime/actions/plain_action.hpp @@ -15,13 +15,13 @@ #include #include #include -#include +#include +#include +#include #include -#include +#include #include -#include - #include #include #include @@ -144,19 +144,19 @@ namespace hpx { namespace traits /**/ #define HPX_DEFINE_PLAIN_ACTION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_DEFINE_PLAIN_ACTION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_DEFINE_PLAIN_ACTION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ #define HPX_DEFINE_PLAIN_DIRECT_ACTION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_DEFINE_PLAIN_DIRECT_ACTION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_DEFINE_PLAIN_DIRECT_ACTION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ #define HPX_DEFINE_PLAIN_ACTION_1(func) \ - HPX_DEFINE_PLAIN_ACTION_2(func, BOOST_PP_CAT(func, _action)) \ + HPX_DEFINE_PLAIN_ACTION_2(func, HPX_PP_CAT(func, _action)) \ /**/ #if defined(__NVCC__) || defined(__CUDACC__) @@ -174,7 +174,7 @@ namespace hpx { namespace traits #endif #define HPX_DEFINE_PLAIN_DIRECT_ACTION_1(func) \ - HPX_DEFINE_PLAIN_DIRECT_ACTION_2(func, BOOST_PP_CAT(func, _action)) \ + HPX_DEFINE_PLAIN_DIRECT_ACTION_2(func, HPX_PP_CAT(func, _action)) \ /**/ #define HPX_DEFINE_PLAIN_DIRECT_ACTION_2(func, name) \ @@ -306,8 +306,8 @@ namespace hpx { namespace traits // macros for plain actions #define HPX_PLAIN_ACTION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_PLAIN_ACTION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_PLAIN_ACTION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ #define HPX_PLAIN_ACTION_2(func, name) \ @@ -316,13 +316,13 @@ namespace hpx { namespace traits HPX_REGISTER_ACTION(name, name); \ /**/ #define HPX_PLAIN_ACTION_1(func) \ - HPX_PLAIN_ACTION_2(func, BOOST_PP_CAT(func, _action)); \ + HPX_PLAIN_ACTION_2(func, HPX_PP_CAT(func, _action)); \ /**/ // same for direct actions #define HPX_PLAIN_DIRECT_ACTION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_PLAIN_DIRECT_ACTION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_PLAIN_DIRECT_ACTION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ #define HPX_PLAIN_DIRECT_ACTION_2(func, name) \ @@ -331,7 +331,7 @@ namespace hpx { namespace traits HPX_REGISTER_ACTION(name, name); \ /**/ #define HPX_PLAIN_DIRECT_ACTION_1(func) \ - HPX_PLAIN_DIRECT_ACTION_2(func, BOOST_PP_CAT(func, _action)); \ + HPX_PLAIN_DIRECT_ACTION_2(func, HPX_PP_CAT(func, _action)); \ /**/ #define HPX_PLAIN_DIRECT_ACTION_ID(func, name, id) \ HPX_DEFINE_PLAIN_DIRECT_ACTION(func, name); \ diff --git a/hpx/runtime/actions/transfer_continuation_action.hpp b/hpx/runtime/actions/transfer_continuation_action.hpp index e2295afd7e4d..2d0d9da8651a 100644 --- a/hpx/runtime/actions/transfer_continuation_action.hpp +++ b/hpx/runtime/actions/transfer_continuation_action.hpp @@ -38,7 +38,8 @@ namespace hpx { namespace actions typedef transfer_base_action base_type; typedef typename base_type::continuation_type continuation_type; public: - // construct an empty transfer_continuation_action to avoid serialization overhead + // construct an empty transfer_continuation_action to avoid serialization + // overhead transfer_continuation_action(); // construct an action from its arguments @@ -71,7 +72,8 @@ namespace hpx { namespace actions naming::id_type&& target, naming::address::address_type lva); threads::thread_function_type - get_thread_function(naming::id_type&& target, naming::address::address_type lva); + get_thread_function(naming::id_type&& target, + naming::address::address_type lva); template void @@ -215,8 +217,8 @@ namespace hpx { namespace actions if (deferred_schedule) { - // If this is a direct action and deferred schedule was requested, that - // is we are not the last parcel, return immediately + // If this is a direct action and deferred schedule was requested, + // that is we are not the last parcel, return immediately if (base_type::direct_execution::value) return; diff --git a/hpx/runtime/actions/trigger.hpp b/hpx/runtime/actions/trigger.hpp index e2ddd0465574..d9c0a43acd5e 100644 --- a/hpx/runtime/actions/trigger.hpp +++ b/hpx/runtime/actions/trigger.hpp @@ -105,7 +105,8 @@ namespace hpx { namespace actions { // Overload when return type is "void" aka util::unused_type template - void trigger_impl(std::true_type, typed_continuation&& cont, + void trigger_impl(std::true_type, + typed_continuation&& cont, F&& f, Ts&&... vs) { try { diff --git a/hpx/runtime/components/component_factory.hpp b/hpx/runtime/components/component_factory.hpp index 5ea0c152387b..1b4abc355a54 100644 --- a/hpx/runtime/components/component_factory.hpp +++ b/hpx/runtime/components/component_factory.hpp @@ -50,12 +50,12 @@ #include #include #include -#include +#include +#include +#include #include #include -#include - #include #include @@ -297,8 +297,8 @@ namespace hpx { namespace components /////////////////////////////////////////////////////////////////////////////// #define HPX_REGISTER_MINIMAL_COMPONENT_FACTORY_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_MINIMAL_COMPONENT_FACTORY_, HPX_UTIL_PP_NARG(__VA_ARGS__)\ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_MINIMAL_COMPONENT_FACTORY_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ #define HPX_REGISTER_MINIMAL_COMPONENT_FACTORY_1(ComponentType) \ @@ -353,9 +353,9 @@ namespace hpx { namespace components #define HPX_REGISTER_MINIMAL_COMPONENT_FACTORY_DYNAMIC_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ + HPX_PP_EXPAND(HPX_PP_CAT( \ HPX_REGISTER_MINIMAL_COMPONENT_FACTORY_DYNAMIC_, \ - HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ #define HPX_REGISTER_MINIMAL_COMPONENT_FACTORY_DYNAMIC_1(ComponentType) \ diff --git a/hpx/runtime/components/component_registry.hpp b/hpx/runtime/components/component_registry.hpp index c075753ab5e2..9961da344a89 100644 --- a/hpx/runtime/components/component_registry.hpp +++ b/hpx/runtime/components/component_registry.hpp @@ -13,7 +13,10 @@ #include #include #include -#include +#include +#include +#include +#include #include #include @@ -21,8 +24,6 @@ #include #include #include -#include -#include #include #include @@ -109,8 +110,8 @@ namespace hpx { namespace components /**/ #define HPX_REGISTER_MINIMAL_COMPONENT_REGISTRY_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_MINIMAL_COMPONENT_REGISTRY_, HPX_UTIL_PP_NARG(__VA_ARGS__)\ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_MINIMAL_COMPONENT_REGISTRY_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -137,9 +138,9 @@ namespace hpx { namespace components /**/ #define HPX_REGISTER_MINIMAL_COMPONENT_REGISTRY_DYNAMIC_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ + HPX_PP_EXPAND(HPX_PP_CAT( \ HPX_REGISTER_MINIMAL_COMPONENT_REGISTRY_DYNAMIC_, \ - HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ diff --git a/hpx/runtime/components/component_startup_shutdown.hpp b/hpx/runtime/components/component_startup_shutdown.hpp index 994d82642b82..ebe3bf643ebc 100644 --- a/hpx/runtime/components/component_startup_shutdown.hpp +++ b/hpx/runtime/components/component_startup_shutdown.hpp @@ -8,6 +8,7 @@ #include #include +#include /////////////////////////////////////////////////////////////////////////////// namespace hpx { namespace components @@ -59,7 +60,7 @@ namespace hpx { namespace components #define HPX_DEFINE_COMPONENT_STARTUP_SHUTDOWN(startup_, shutdown_) \ namespace hpx { namespace components { namespace startup_shutdown_provider\ { \ - bool BOOST_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _startup)( \ + bool HPX_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _startup)( \ startup_function_type& startup_func, bool& pre_startup) \ { \ util::function_nonser tmp = \ @@ -67,7 +68,7 @@ namespace hpx { namespace components if (!!tmp) { return tmp(startup_func, pre_startup); } \ return false; \ } \ - bool BOOST_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _shutdown)( \ + bool HPX_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _shutdown)( \ shutdown_function_type& shutdown_func, bool& pre_shutdown) \ { \ util::function_nonser tmp = \ @@ -84,17 +85,17 @@ namespace hpx { namespace components namespace hpx { namespace components { namespace startup_shutdown_provider\ { \ typedef component_startup_shutdown< \ - BOOST_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _startup), \ - BOOST_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _shutdown) \ - > BOOST_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _provider); \ + HPX_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _startup), \ + HPX_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _shutdown) \ + > HPX_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _provider); \ }}} \ namespace hpx { namespace components \ { \ template struct component_startup_shutdown< \ startup_shutdown_provider:: \ - BOOST_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _startup), \ + HPX_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _startup), \ startup_shutdown_provider:: \ - BOOST_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _shutdown) \ + HPX_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _shutdown) \ >; \ }} \ /**/ @@ -104,14 +105,14 @@ namespace hpx { namespace components HPX_REGISTER_STARTUP_SHUTDOWN_MODULE_(startup, shutdown) \ HPX_REGISTER_STARTUP_SHUTDOWN_REGISTRY( \ hpx::components::startup_shutdown_provider:: \ - BOOST_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _provider), startup_shutdown) \ + HPX_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _provider), startup_shutdown) \ /**/ #define HPX_REGISTER_STARTUP_SHUTDOWN_MODULE_DYNAMIC(startup, shutdown) \ HPX_REGISTER_STARTUP_SHUTDOWN_FUNCTIONS_DYNAMIC() \ HPX_REGISTER_STARTUP_SHUTDOWN_MODULE_(startup, shutdown) \ HPX_REGISTER_STARTUP_SHUTDOWN_REGISTRY_DYNAMIC( \ hpx::components::startup_shutdown_provider:: \ - BOOST_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _provider), startup_shutdown) \ + HPX_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _provider), startup_shutdown) \ /**/ #define HPX_REGISTER_STARTUP_MODULE(startup) \ @@ -119,14 +120,14 @@ namespace hpx { namespace components HPX_REGISTER_STARTUP_SHUTDOWN_MODULE_(startup, 0) \ HPX_REGISTER_STARTUP_SHUTDOWN_REGISTRY( \ hpx::components::startup_shutdown_provider:: \ - BOOST_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _provider), startup_shutdown) \ + HPX_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _provider), startup_shutdown) \ /**/ #define HPX_REGISTER_STARTUP_MODULE_DYNAMIC(startup) \ HPX_REGISTER_STARTUP_SHUTDOWN_FUNCTIONS_DYNAMIC() \ HPX_REGISTER_STARTUP_SHUTDOWN_MODULE_(startup, 0) \ HPX_REGISTER_STARTUP_SHUTDOWN_REGISTRY_DYNAMIC( \ hpx::components::startup_shutdown_provider:: \ - BOOST_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _provider), startup_shutdown) \ + HPX_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _provider), startup_shutdown) \ /**/ #define HPX_REGISTER_SHUTDOWN_MODULE(shutdown) \ @@ -134,14 +135,14 @@ namespace hpx { namespace components HPX_REGISTER_STARTUP_SHUTDOWN_MODULE_(0, shutdown) \ HPX_REGISTER_STARTUP_SHUTDOWN_REGISTRY( \ hpx::components::startup_shutdown_provider:: \ - BOOST_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _provider), startup_shutdown) \ + HPX_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _provider), startup_shutdown) \ /**/ #define HPX_REGISTER_SHUTDOWN_MODULE_DYNAMIC(shutdown) \ HPX_REGISTER_STARTUP_SHUTDOWN_FUNCTIONS_DYNAMIC() \ HPX_REGISTER_STARTUP_SHUTDOWN_MODULE_(0, shutdown) \ HPX_REGISTER_STARTUP_SHUTDOWN_REGISTRY_DYNAMIC( \ hpx::components::startup_shutdown_provider:: \ - BOOST_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _provider), startup_shutdown) \ + HPX_PP_CAT(HPX_PLUGIN_COMPONENT_PREFIX, _provider), startup_shutdown) \ /**/ #endif // HPX_A7F46A4F_9AF9_4909_B0D8_5304FEFC5649 diff --git a/hpx/runtime/components/component_type.hpp b/hpx/runtime/components/component_type.hpp index e0eb41abe270..248483b5dcb9 100644 --- a/hpx/runtime/components/component_type.hpp +++ b/hpx/runtime/components/component_type.hpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include @@ -155,8 +155,8 @@ namespace hpx { namespace components #define HPX_DEFINE_GET_COMPONENT_TYPE_TEMPLATE(template_, component) \ namespace hpx { namespace traits \ { \ - HPX_UTIL_STRIP(template_) \ - struct component_type_database \ + HPX_PP_STRIP_PARENS(template_) \ + struct component_type_database \ { \ static components::component_type value; \ \ @@ -166,8 +166,8 @@ namespace hpx { namespace components { value = t; } \ }; \ \ - HPX_UTIL_STRIP(template_) components::component_type \ - component_type_database::value = \ + HPX_PP_STRIP_PARENS(template_) components::component_type \ + component_type_database::value = \ components::component_invalid; \ }} \ /**/ diff --git a/hpx/runtime/components/derived_component_factory.hpp b/hpx/runtime/components/derived_component_factory.hpp index e96bceeb9ad0..e1d7cec489f4 100644 --- a/hpx/runtime/components/derived_component_factory.hpp +++ b/hpx/runtime/components/derived_component_factory.hpp @@ -16,12 +16,12 @@ #include #include #include -#include +#include +#include +#include +#include #include -#include -#include - #include #include @@ -271,8 +271,8 @@ namespace hpx { namespace components /**/ #define HPX_REGISTER_DERIVED_COMPONENT_FACTORY_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_REGISTER_DERIVED_COMPONENT_FACTORY_, HPX_UTIL_PP_NARG(__VA_ARGS__)\ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_REGISTER_DERIVED_COMPONENT_FACTORY_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ #define HPX_REGISTER_DERIVED_COMPONENT_FACTORY_3(ComponentType, componentname,\ @@ -302,9 +302,9 @@ namespace hpx { namespace components /**/ #define HPX_REGISTER_DERIVED_COMPONENT_FACTORY_DYNAMIC_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ + HPX_PP_EXPAND(HPX_PP_CAT( \ HPX_REGISTER_DERIVED_COMPONENT_FACTORY_DYNAMIC_, \ - HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ #define HPX_REGISTER_DERIVED_COMPONENT_FACTORY_DYNAMIC_3(ComponentType, \ diff --git a/hpx/runtime/components/server/distributed_metadata_base.hpp b/hpx/runtime/components/server/distributed_metadata_base.hpp index 2dafab65a062..87a3e2f78e5a 100644 --- a/hpx/runtime/components/server/distributed_metadata_base.hpp +++ b/hpx/runtime/components/server/distributed_metadata_base.hpp @@ -12,7 +12,9 @@ #include #include #include -#include +#include +#include +#include #include @@ -55,8 +57,8 @@ namespace hpx { namespace components { namespace server HPX_DISTRIBUTED_METADATA_DECLARATION_(__VA_ARGS__) \ /**/ #define HPX_DISTRIBUTED_METADATA_DECLARATION_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_DISTRIBUTED_METADATA_DECLARATION_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_DISTRIBUTED_METADATA_DECLARATION_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -67,18 +69,18 @@ namespace hpx { namespace components { namespace server HPX_REGISTER_ACTION_DECLARATION( \ ::hpx::components::server::distributed_metadata_base:: \ get_action, \ - BOOST_PP_CAT(__distributed_metadata_get_action_, name)); \ + HPX_PP_CAT(__distributed_metadata_get_action_, name)); \ HPX_REGISTER_ACTION_DECLARATION( \ ::hpx::lcos::base_lco_with_value::set_value_action, \ - BOOST_PP_CAT(__set_value_distributed_metadata_config_data_, name)) \ + HPX_PP_CAT(__set_value_distributed_metadata_config_data_, name)) \ /**/ #define HPX_DISTRIBUTED_METADATA(...) \ HPX_DISTRIBUTED_METADATA_(__VA_ARGS__) \ /**/ #define HPX_DISTRIBUTED_METADATA_(...) \ - HPX_UTIL_EXPAND_(BOOST_PP_CAT( \ - HPX_DISTRIBUTED_METADATA_, HPX_UTIL_PP_NARG(__VA_ARGS__) \ + HPX_PP_EXPAND(HPX_PP_CAT( \ + HPX_DISTRIBUTED_METADATA_, HPX_PP_NARGS(__VA_ARGS__) \ )(__VA_ARGS__)) \ /**/ @@ -89,15 +91,15 @@ namespace hpx { namespace components { namespace server HPX_REGISTER_ACTION( \ ::hpx::components::server::distributed_metadata_base:: \ get_action, \ - BOOST_PP_CAT(__distributed_metadata_get_action_, name)); \ + HPX_PP_CAT(__distributed_metadata_get_action_, name)); \ HPX_REGISTER_ACTION( \ ::hpx::lcos::base_lco_with_value::set_value_action, \ - BOOST_PP_CAT(__set_value_distributed_metadata_config_data_, name)) \ + HPX_PP_CAT(__set_value_distributed_metadata_config_data_, name)) \ typedef ::hpx::components::simple_component< \ ::hpx::components::server::distributed_metadata_base \ - > BOOST_PP_CAT(__distributed_metadata_, name); \ + > HPX_PP_CAT(__distributed_metadata_, name); \ HPX_REGISTER_COMPONENT( \ - BOOST_PP_CAT(__distributed_metadata_, name)) \ + HPX_PP_CAT(__distributed_metadata_, name)) \ /**/ #endif diff --git a/hpx/runtime/components/static_factory_data.hpp b/hpx/runtime/components/static_factory_data.hpp index 77b1edb3c33a..63cddcd652c7 100644 --- a/hpx/runtime/components/static_factory_data.hpp +++ b/hpx/runtime/components/static_factory_data.hpp @@ -9,10 +9,10 @@ #define HPX_COMPONENTS_STATIC_FACTORY_DATA_HPP #include +#include #include #include - -#include +#include #include #include @@ -40,7 +40,7 @@ namespace hpx { namespace components #define HPX_DEFINE_FACTORY_STATIC(module, name, base) \ { \ - BOOST_PP_STRINGIZE(module), \ + HPX_PP_STRINGIZE(module), \ HPX_PLUGIN_LIST_NAME(name, base) \ } \ /**/ @@ -49,15 +49,15 @@ namespace hpx { namespace components #define HPX_INIT_REGISTRY_MODULE_STATIC(name, base) \ HPX_DECLARE_FACTORY_STATIC(name, base); \ namespace { \ - struct BOOST_PP_CAT(init_registry_module_static_, name) \ + struct HPX_PP_CAT(init_registry_module_static_, name) \ { \ - BOOST_PP_CAT(init_registry_module_static_, name)() \ + HPX_PP_CAT(init_registry_module_static_, name)() \ { \ hpx::components::static_factory_load_data_type data = \ HPX_DEFINE_FACTORY_STATIC(HPX_COMPONENT_NAME, name, base);\ hpx::components::init_registry_module(data); \ } \ - } BOOST_PP_CAT(module_data_, __LINE__); \ + } HPX_PP_CAT(module_data_, __LINE__); \ } \ /**/ @@ -65,15 +65,15 @@ namespace hpx { namespace components #define HPX_INIT_REGISTRY_FACTORY_STATIC(name, componentname, base) \ HPX_DECLARE_FACTORY_STATIC(name, base); \ namespace { \ - struct BOOST_PP_CAT(init_registry_factory_static_, componentname) \ + struct HPX_PP_CAT(init_registry_factory_static_, componentname) \ { \ - BOOST_PP_CAT(init_registry_factory_static_, componentname)() \ + HPX_PP_CAT(init_registry_factory_static_, componentname)() \ { \ hpx::components::static_factory_load_data_type data = \ HPX_DEFINE_FACTORY_STATIC(componentname, name, base); \ hpx::components::init_registry_factory(data); \ } \ - } BOOST_PP_CAT(componentname, BOOST_PP_CAT(_factory_data_, __LINE__));\ + } HPX_PP_CAT(componentname, HPX_PP_CAT(_factory_data_, __LINE__)); \ } \ /**/ @@ -81,15 +81,15 @@ namespace hpx { namespace components #define HPX_INIT_REGISTRY_COMMANDLINE_STATIC(name, base) \ HPX_DECLARE_FACTORY_STATIC(name, base); \ namespace { \ - struct BOOST_PP_CAT(init_registry_module_commandline_, name) \ + struct HPX_PP_CAT(init_registry_module_commandline_, name) \ { \ - BOOST_PP_CAT(init_registry_module_commandline_, name)() \ + HPX_PP_CAT(init_registry_module_commandline_, name)() \ { \ hpx::components::static_factory_load_data_type data = \ HPX_DEFINE_FACTORY_STATIC(HPX_COMPONENT_NAME, name, base);\ hpx::components::init_registry_commandline(data); \ } \ - } BOOST_PP_CAT(module_commandline_data_, __LINE__); \ + } HPX_PP_CAT(module_commandline_data_, __LINE__); \ } \ /**/ @@ -97,15 +97,15 @@ namespace hpx { namespace components #define HPX_INIT_REGISTRY_STARTUP_SHUTDOWN_STATIC(name, base) \ HPX_DECLARE_FACTORY_STATIC(name, base); \ namespace { \ - struct BOOST_PP_CAT(init_registry_module_startup_shutdown_, name) \ + struct HPX_PP_CAT(init_registry_module_startup_shutdown_, name) \ { \ - BOOST_PP_CAT(init_registry_module_startup_shutdown_, name)() \ + HPX_PP_CAT(init_registry_module_startup_shutdown_, name)() \ { \ hpx::components::static_factory_load_data_type data = \ HPX_DEFINE_FACTORY_STATIC(HPX_COMPONENT_NAME, name, base);\ hpx::components::init_registry_startup_shutdown(data); \ } \ - } BOOST_PP_CAT(module_startup_shutdown_data_, __LINE__); \ + } HPX_PP_CAT(module_startup_shutdown_data_, __LINE__); \ } \ /**/ diff --git a/hpx/runtime/components/unique_component_name.hpp b/hpx/runtime/components/unique_component_name.hpp index d1cd9d2c6e4b..8adcdd317b57 100644 --- a/hpx/runtime/components/unique_component_name.hpp +++ b/hpx/runtime/components/unique_component_name.hpp @@ -6,7 +6,7 @@ #if !defined(HPX_A7F46A4F_9AF9_4909_B0D8_5304FEFC5649) #define HPX_A7F46A4F_9AF9_4909_B0D8_5304FEFC5649 -#include +#include namespace hpx { namespace components { @@ -30,7 +30,7 @@ namespace hpx { namespace components \ static type call (void) \ { \ - return BOOST_PP_STRINGIZE(name); \ + return HPX_PP_STRINGIZE(name); \ } \ }; \ }} \ @@ -46,7 +46,7 @@ namespace hpx { namespace components \ static type call (void) \ { \ - return BOOST_PP_STRINGIZE(name); \ + return HPX_PP_STRINGIZE(name); \ } \ }; \ \ diff --git a/hpx/runtime/parcelset/detail/per_action_data_counter_registry.hpp b/hpx/runtime/parcelset/detail/per_action_data_counter_registry.hpp index c07a66dc33d4..ae1f9b223bcf 100644 --- a/hpx/runtime/parcelset/detail/per_action_data_counter_registry.hpp +++ b/hpx/runtime/parcelset/detail/per_action_data_counter_registry.hpp @@ -11,12 +11,12 @@ #if defined(HPX_HAVE_PARCELPORT_ACTION_COUNTERS) #include +#include #include #include #include #include -#include #include #include diff --git a/hpx/runtime/serialization/container.hpp b/hpx/runtime/serialization/container.hpp index 674fda1bb6d0..8df7c4d08453 100644 --- a/hpx/runtime/serialization/container.hpp +++ b/hpx/runtime/serialization/container.hpp @@ -31,7 +31,8 @@ namespace hpx { namespace serialization naming::gid_type const & split_gid) = 0; virtual void set_filter(binary_filter* filter) = 0; virtual void save_binary(void const* address, std::size_t count) = 0; - virtual std::size_t save_binary_chunk(void const* address, std::size_t count) = 0; + virtual std::size_t save_binary_chunk( + void const* address, std::size_t count) = 0; virtual void reset() = 0; virtual std::size_t get_num_chunks() const = 0; virtual void flush() = 0; diff --git a/hpx/runtime/serialization/detail/polymorphic_id_factory.hpp b/hpx/runtime/serialization/detail/polymorphic_id_factory.hpp index 08412a6b188d..a8a27b72ba7d 100644 --- a/hpx/runtime/serialization/detail/polymorphic_id_factory.hpp +++ b/hpx/runtime/serialization/detail/polymorphic_id_factory.hpp @@ -14,10 +14,9 @@ #include #include #include +#include #include -#include - #include #include #include @@ -180,15 +179,15 @@ namespace hpx { namespace serialization { #include -#define HPX_SERIALIZATION_ADD_CONSTANT_ENTRY(String, Id) \ - namespace hpx { namespace serialization { namespace detail { \ - template <> std::string get_constant_entry_name() \ - { \ - return BOOST_PP_STRINGIZE(String); \ - } \ - template add_constant_entry \ - add_constant_entry::instance; \ - }}} \ +#define HPX_SERIALIZATION_ADD_CONSTANT_ENTRY(String, Id) \ + namespace hpx { namespace serialization { namespace detail { \ + template <> std::string get_constant_entry_name() \ + { \ + return HPX_PP_STRINGIZE(String); \ + } \ + template add_constant_entry \ + add_constant_entry::instance; \ + }}} \ /**/ #endif diff --git a/hpx/runtime/serialization/detail/polymorphic_intrusive_factory.hpp b/hpx/runtime/serialization/detail/polymorphic_intrusive_factory.hpp index 0371a5eda3b4..65d8d8db3ecc 100644 --- a/hpx/runtime/serialization/detail/polymorphic_intrusive_factory.hpp +++ b/hpx/runtime/serialization/detail/polymorphic_intrusive_factory.hpp @@ -11,10 +11,9 @@ #include #include #include +#include #include -#include - #include #include @@ -148,12 +147,12 @@ namespace hpx { namespace serialization { namespace detail /**/ #define HPX_SERIALIZATION_POLYMORPHIC(Class) \ - HPX_SERIALIZATION_POLYMORPHIC_WITH_NAME(Class, BOOST_PP_STRINGIZE(Class)) \ + HPX_SERIALIZATION_POLYMORPHIC_WITH_NAME(Class, HPX_PP_STRINGIZE(Class)) \ /**/ #define HPX_SERIALIZATION_POLYMORPHIC_SPLITTED(Class) \ HPX_SERIALIZATION_POLYMORPHIC_WITH_NAME_SPLITTED( \ - Class, BOOST_PP_STRINGIZE(Class)) \ + Class, HPX_PP_STRINGIZE(Class)) \ /**/ #define HPX_SERIALIZATION_POLYMORPHIC_TEMPLATE(Class) \ diff --git a/hpx/runtime/serialization/detail/polymorphic_nonintrusive_factory.hpp b/hpx/runtime/serialization/detail/polymorphic_nonintrusive_factory.hpp index de61424d7828..414ed55e0fd1 100644 --- a/hpx/runtime/serialization/detail/polymorphic_nonintrusive_factory.hpp +++ b/hpx/runtime/serialization/detail/polymorphic_nonintrusive_factory.hpp @@ -15,6 +15,8 @@ #include #include #include +#include +#include #include #include @@ -226,8 +228,8 @@ namespace hpx { namespace serialization { namespace detail #define HPX_SERIALIZATION_REGISTER_CLASS_NAME_TEMPLATE( \ Parameters, Template, Name) \ namespace hpx { namespace serialization { namespace detail { \ - HPX_UTIL_STRIP(Parameters) \ - struct HPX_ALWAYS_EXPORT get_serialization_name \ { \ char const* operator()() \ @@ -238,15 +240,15 @@ namespace hpx { namespace serialization { namespace detail }}} \ /**/ #define HPX_SERIALIZATION_REGISTER_CLASS(Class) \ - HPX_SERIALIZATION_REGISTER_CLASS_NAME(Class, BOOST_PP_STRINGIZE(Class)) \ + HPX_SERIALIZATION_REGISTER_CLASS_NAME(Class, HPX_PP_STRINGIZE(Class)) \ /**/ #define HPX_SERIALIZATION_REGISTER_CLASS_TEMPLATE(Parameters, Template) \ HPX_SERIALIZATION_REGISTER_CLASS_NAME_TEMPLATE( \ Parameters, Template, \ - hpx::util::type_id::typeid_.type_id()) \ - HPX_UTIL_STRIP(Parameters) hpx::serialization::detail::register_class< \ - HPX_UTIL_STRIP(Template)> \ - HPX_UTIL_STRIP(Template)::hpx_register_class_instance; \ + hpx::util::type_id::typeid_.type_id())\ + HPX_PP_STRIP_PARENS(Parameters) hpx::serialization::detail::register_class< \ + HPX_PP_STRIP_PARENS(Template)> \ + HPX_PP_STRIP_PARENS(Template)::hpx_register_class_instance; \ /**/ #define HPX_SERIALIZATION_POLYMORPHIC_TEMPLATE_SEMIINTRUSIVE(Template) \ static hpx::serialization::detail::register_class