From f36c291ec8ba3b6e0d179a30386d80e850a72c5c Mon Sep 17 00:00:00 2001 From: Thomas Heller Date: Mon, 14 Sep 2015 17:01:33 +0200 Subject: [PATCH] Removing hpx_fwd.hpp includes As a start, this patch removes hpx_fwd.hpp from all of hpx/util and deals with the avalanche for the rest of the headers. --- docs/CMakeLists.txt | 5 + hpx/config/asio.hpp | 13 ++ hpx/exception.hpp | 29 +--- hpx/exception_fwd.hpp | 52 +++++++ hpx/hpx_fwd.hpp | 129 +----------------- hpx/lcos/base_lco.hpp | 2 +- hpx/lcos/base_lco_with_value.hpp | 2 +- .../parcelport/tcp/connection_handler.hpp | 1 + hpx/plugins/parcelport/tcp/locality.hpp | 1 + hpx/plugins/parcelport/tcp/receiver.hpp | 1 + hpx/plugins/parcelport/tcp/sender.hpp | 1 + hpx/runtime/actions/continuation.hpp | 42 +++--- hpx/runtime/actions/continuation_fwd.hpp | 17 +++ hpx/runtime/actions/transfer_action.hpp | 2 +- hpx/runtime/agas/request.hpp | 2 +- hpx/runtime/agas/response.hpp | 2 +- hpx/runtime/agas_fwd.hpp | 28 ++++ hpx/runtime/applier/applier.hpp | 11 +- hpx/runtime/applier/bind_naming_wrappers.hpp | 3 +- hpx/runtime/components/client_base.hpp | 1 + .../components/server/wrapper_heap.hpp | 17 ++- hpx/runtime/find_here.hpp | 47 +++++++ hpx/runtime/get_locality_id.hpp | 44 ++++++ hpx/runtime/naming/id_type.hpp | 2 +- hpx/runtime/parcelset/locality.hpp | 1 - hpx/runtime/parcelset_fwd.hpp | 40 ++++++ hpx/runtime/runtime_mode.hpp | 37 +++++ hpx/runtime/serialization/binary_filter.hpp | 2 +- .../serialization/serialization_fwd.hpp | 2 + .../threads/detail/periodic_maintenance.hpp | 1 + .../threads/detail/set_thread_state.hpp | 1 + hpx/runtime/threads/thread_init_data.hpp | 2 +- hpx/runtime/threads/topology.hpp | 2 +- hpx/traits/action_capability_provider.hpp | 3 +- hpx/traits/action_decorate_continuation.hpp | 2 +- hpx/traits/action_decorate_function.hpp | 1 - .../action_does_termination_detection.hpp | 1 - hpx/traits/action_is_target_valid.hpp | 2 +- hpx/traits/action_message_handler.hpp | 3 +- hpx/traits/action_priority.hpp | 2 +- hpx/traits/action_schedule_thread.hpp | 4 +- hpx/traits/action_serialization_filter.hpp | 4 +- hpx/traits/action_stacksize.hpp | 2 +- hpx/traits/is_launch_policy.hpp | 1 + hpx/util/activate_counters.hpp | 5 +- hpx/util/any.hpp | 2 +- hpx/util/apex.hpp | 2 +- hpx/util/asio_util.hpp | 3 +- hpx/util/batch_environment.hpp | 4 +- .../batch_environments/pbs_environment.hpp | 3 +- hpx/util/bind_action.hpp | 2 +- hpx/util/buffer_pool.hpp | 2 - hpx/util/command_line_handling.hpp | 8 +- hpx/util/connection_cache.hpp | 2 +- hpx/util/coordinate.hpp | 2 +- hpx/util/coroutine/detail/context_posix.hpp | 1 + .../detail/context_windows_fibers.hpp | 1 + .../coroutine/detail/default_context_impl.hpp | 2 +- hpx/util/coroutine/detail/posix_utility.hpp | 2 + hpx/util/functional/colocated_helpers.hpp | 4 +- hpx/util/generate_unique_ids.hpp | 7 +- hpx/util/init_ini_data.hpp | 10 +- hpx/util/init_logging.hpp | 6 +- hpx/util/integer/int128.hpp | 8 +- hpx/util/integer/uint128.hpp | 8 +- hpx/util/io_service_pool.hpp | 3 +- hpx/util/manage_config.hpp | 5 +- hpx/util/map_hostnames.hpp | 7 +- hpx/util/one_size_heap_list.hpp | 19 ++- hpx/util/parse_command_line.hpp | 8 +- hpx/util/query_counters.hpp | 7 +- hpx/util/remove_local_destinations.hpp | 1 - hpx/util/runtime_configuration.hpp | 12 +- .../security/root_certificate_authority.hpp | 6 +- .../subordinate_certificate_authority.hpp | 7 +- hpx/util/serialize_exception.hpp | 6 +- hpx/util/thread_aware_timer.hpp | 3 +- hpx/util/thread_mapper.hpp | 2 +- src/components/papi_counters/util/papi.cpp | 13 +- src/hpx_init.cpp | 1 - src/runtime/parcelset/parcelhandler.cpp | 3 +- .../threads/executors/service_executor.cpp | 1 + src/util/asio_util.cpp | 10 +- src/util/batch_environment.cpp | 10 +- src/util/command_line_handling.cpp | 4 +- src/util/coroutine/detail/tss.cpp | 2 +- src/util/generate_unique_ids.cpp | 8 -- src/util/init_ini_data.cpp | 1 - src/util/integer/int128.cpp | 6 +- src/util/integer/uint128.cpp | 6 +- src/util/io_service_pool.cpp | 3 +- src/util/itt_notify.cpp | 1 - src/util/logging.cpp | 2 +- src/util/manage_config.cpp | 1 - src/util/map_hostnames.cpp | 8 +- src/util/parse_command_line.cpp | 1 - src/util/register_locks.cpp | 4 +- src/util/register_locks_globally.cpp | 1 - src/util/runtime_configuration.cpp | 1 - .../security/root_certificate_authority.cpp | 2 +- .../subordinate_certificate_authority.cpp | 2 +- src/util/sed_transform.cpp | 1 - src/util/serialize_exception.cpp | 1 - src/util/static_reinit.cpp | 1 - src/util/thread_mapper.cpp | 1 - 105 files changed, 495 insertions(+), 337 deletions(-) create mode 100644 hpx/config/asio.hpp create mode 100644 hpx/exception_fwd.hpp create mode 100644 hpx/runtime/actions/continuation_fwd.hpp create mode 100644 hpx/runtime/agas_fwd.hpp create mode 100644 hpx/runtime/find_here.hpp create mode 100644 hpx/runtime/get_locality_id.hpp create mode 100644 hpx/runtime/parcelset_fwd.hpp create mode 100644 hpx/runtime/runtime_mode.hpp diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index bd2ef2fb37cd..7cc2cfb99902 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -51,6 +51,7 @@ set(doxygen_dependencies "${PROJECT_SOURCE_DIR}/hpx/hpx_finalize.hpp" "${PROJECT_SOURCE_DIR}/hpx/error.hpp" "${PROJECT_SOURCE_DIR}/hpx/exception.hpp" + "${PROJECT_SOURCE_DIR}/hpx/exception_fwd.hpp" "${PROJECT_SOURCE_DIR}/hpx/exception_list.hpp" "${PROJECT_SOURCE_DIR}/hpx/lcos_fwd.hpp" "${PROJECT_SOURCE_DIR}/hpx/components/component_storage/migrate_from_storage.hpp" @@ -109,9 +110,13 @@ set(doxygen_dependencies "${PROJECT_SOURCE_DIR}/hpx/runtime/basename_registration.hpp" "${PROJECT_SOURCE_DIR}/hpx/runtime/get_ptr.hpp" "${PROJECT_SOURCE_DIR}/hpx/runtime/get_locality_name.hpp" + "${PROJECT_SOURCE_DIR}/hpx/runtime/get_locality_id.hpp" "${PROJECT_SOURCE_DIR}/hpx/runtime/get_os_thread_count.hpp" "${PROJECT_SOURCE_DIR}/hpx/runtime/get_worker_thread_num.hpp" + "${PROJECT_SOURCE_DIR}/hpx/runtime/find_here.hpp" "${PROJECT_SOURCE_DIR}/hpx/runtime/launch_policy.hpp" + "${PROJECT_SOURCE_DIR}/hpx/runtime/parcelset_fwd.hpp" + "${PROJECT_SOURCE_DIR}/hpx/runtime/runtime_mode.hpp" "${PROJECT_SOURCE_DIR}/hpx/runtime/set_parcel_write_handler.hpp" "${PROJECT_SOURCE_DIR}/hpx/runtime/trigger_lco.hpp" "${PROJECT_SOURCE_DIR}/hpx/runtime/actions/basic_action.hpp" diff --git a/hpx/config/asio.hpp b/hpx/config/asio.hpp new file mode 100644 index 000000000000..0db3d557bdba --- /dev/null +++ b/hpx/config/asio.hpp @@ -0,0 +1,13 @@ +// Copyright (c) 2015 Thomas Heller +// +// 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_CONFIG_ASIO_HPP) +#define HPX_CONFIG_ASIO_HPP + +#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) +#include +#endif + +#endif diff --git a/hpx/exception.hpp b/hpx/exception.hpp index ddcc232a176d..47e177b2dd43 100644 --- a/hpx/exception.hpp +++ b/hpx/exception.hpp @@ -10,6 +10,7 @@ #define HPX_EXCEPTION_MAR_24_2008_0929AM #include +#include #include #include #include @@ -36,12 +37,6 @@ /////////////////////////////////////////////////////////////////////////////// namespace hpx { - /// \cond NOINTERNAL - // forward declaration - class error_code; - class exception; - /// \endcond - /// \cond NODETAIL namespace detail { @@ -343,28 +338,6 @@ namespace hpx boost::exception_ptr exception_; }; - /// \brief Predefined error_code object used as "throw on error" tag. - /// - /// The predefined hpx::error_code object \a hpx::throws is supplied for use as - /// a "throw on error" tag. - /// - /// Functions that specify an argument in the form 'error_code& ec=throws' - /// (with appropriate namespace qualifiers), have the following error - /// handling semantics: - /// - /// If &ec != &throws and an error occurred: ec.value() returns the - /// implementation specific error number for the particular error that - /// occurred and ec.category() returns the error_category for ec.value(). - /// - /// If &ec != &throws and an error did not occur, ec.clear(). - /// - /// If an error occurs and &ec == &throws, the function throws an exception - /// of type \a hpx::exception or of a type derived from it. The exception's - /// \a get_errorcode() member function returns a reference to an - /// \a hpx::error_code object with the behavior as specified above. - /// - HPX_EXCEPTION_EXPORT extern error_code throws; - /// @{ /// \brief Returns a new error_code constructed from the given parameters. inline error_code diff --git a/hpx/exception_fwd.hpp b/hpx/exception_fwd.hpp new file mode 100644 index 000000000000..6862b626fc74 --- /dev/null +++ b/hpx/exception_fwd.hpp @@ -0,0 +1,52 @@ +// Copyright (c) 2007-2014 Hartmut Kaiser +// Copyright (c) 2011 Bryce Lelbach +// +// 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) + +/// \file exception_fwd.hpp + +#ifndef HPX_EXCEPTION_FWD_HPP +#define HPX_EXCEPTION_FWD_HPP + +#include + +/// \cond NOINTERNAL +namespace boost +{ + class exception_ptr; +} +/// \endcond + +namespace hpx +{ + /// \cond NOINTERNAL + // forward declaration + class error_code; + class exception; + /// \endcond + + /// \brief Predefined error_code object used as "throw on error" tag. + /// + /// The predefined hpx::error_code object \a hpx::throws is supplied for use as + /// a "throw on error" tag. + /// + /// Functions that specify an argument in the form 'error_code& ec=throws' + /// (with appropriate namespace qualifiers), have the following error + /// handling semantics: + /// + /// If &ec != &throws and an error occurred: ec.value() returns the + /// implementation specific error number for the particular error that + /// occurred and ec.category() returns the error_category for ec.value(). + /// + /// If &ec != &throws and an error did not occur, ec.clear(). + /// + /// If an error occurs and &ec == &throws, the function throws an exception + /// of type \a hpx::exception or of a type derived from it. The exception's + /// \a get_errorcode() member function returns a reference to an + /// \a hpx::error_code object with the behavior as specified above. + /// + HPX_EXCEPTION_EXPORT extern error_code throws; +} + +#endif diff --git a/hpx/hpx_fwd.hpp b/hpx/hpx_fwd.hpp index 2a15d4c67344..6c7f7ea0988a 100644 --- a/hpx/hpx_fwd.hpp +++ b/hpx/hpx_fwd.hpp @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -46,20 +47,17 @@ #include #include #include +#include +#include #include +#include +#include #include #include #include #include #include -/// \cond NOINTERNAL -namespace boost -{ - class exception_ptr; -} -/// \endcond - /// \namespace hpx /// /// The namespace \a hpx is the main namespace of the HPX library. All classes @@ -86,18 +84,6 @@ namespace hpx HPX_API_EXPORT applier* get_applier_ptr(); } - namespace agas - { - struct HPX_API_EXPORT addressing_service; - - enum service_mode - { - service_mode_invalid = -1, - service_mode_bootstrap = 0, - service_mode_hosted = 1 - }; - } - /// \namespace naming /// /// The namespace \a naming contains all definitions needed for the AGAS @@ -117,61 +103,9 @@ namespace hpx typedef boost::uint64_t address_type; } - /////////////////////////////////////////////////////////////////////////// - /// \namespace parcelset - namespace parcelset - { - class HPX_API_EXPORT locality; - - class HPX_API_EXPORT parcel; - class HPX_API_EXPORT parcelport; - class HPX_API_EXPORT parcelhandler; - - namespace server - { - class parcelport_queue; - } - - struct parcelhandler_queue_base; - - namespace policies - { - struct global_parcelhandler_queue; - typedef global_parcelhandler_queue parcelhandler_queue; - - struct message_handler; - } - - HPX_API_EXPORT policies::message_handler* get_message_handler( - parcelhandler* ph, char const* name, char const* type, - std::size_t num, std::size_t interval, locality const& l, - error_code& ec = throws); - - HPX_API_EXPORT bool do_background_work(std::size_t num_thread = 0); - } - class HPX_API_EXPORT runtime; class HPX_API_EXPORT thread; - /// A HPX runtime can be executed in two different modes: console mode - /// and worker mode. - enum runtime_mode - { - runtime_mode_invalid = -1, - runtime_mode_console = 0, ///< The runtime is the console locality - runtime_mode_worker = 1, ///< The runtime is a worker locality - runtime_mode_connect = 2, ///< The runtime is a worker locality - ///< connecting late - runtime_mode_default = 3, ///< The runtime mode will be determined - ///< based on the command line arguments - runtime_mode_last - }; - - /// Get the readable string representing the name of the given runtime_mode - /// constant. - HPX_API_EXPORT char const* get_runtime_mode_name(runtime_mode state); - HPX_API_EXPORT runtime_mode get_runtime_mode_from_name(std::string const& mode); - /////////////////////////////////////////////////////////////////////////// template class HPX_API_EXPORT runtime_impl; @@ -315,34 +249,6 @@ namespace hpx namespace hpx { - /////////////////////////////////////////////////////////////////////////// - /// \brief Return the global id representing this locality - /// - /// The function \a find_here() can be used to retrieve the global id - /// usable to refer to the current locality. - /// - /// \param ec [in,out] this represents the error status on exit, if this - /// is pre-initialized to \a hpx#throws the function will throw - /// on error instead. - /// - /// \note Generally, the id of a locality can be used for instance to - /// create new instances of components and to invoke plain actions - /// (global functions). - /// - /// \returns The global id representing the locality this function has - /// been called on. - /// - /// \note As long as \a ec is not pre-initialized to \a hpx::throws this - /// function doesn't throw but returns the result code using the - /// parameter \a ec. Otherwise it throws an instance of - /// hpx::exception. - /// - /// \note This function will return meaningful results only if called - /// from an HPX-thread. It will return \a hpx::naming::invalid_id - /// otherwise. - /// - /// \see \a hpx::find_all_localities(), \a hpx::find_locality() - HPX_API_EXPORT naming::id_type find_here(error_code& ec = throws); /////////////////////////////////////////////////////////////////////////// /// \brief Return the global id representing the root locality @@ -729,30 +635,6 @@ namespace hpx /// \see \a hpx::register_pre_shutdown_function() HPX_API_EXPORT void register_shutdown_function(shutdown_function_type const& f); - /////////////////////////////////////////////////////////////////////////// - /// \brief Return the number of the locality this function is being called - /// from. - /// - /// This function returns the id of the current locality. - /// - /// \param ec [in,out] this represents the error status on exit, if this - /// is pre-initialized to \a hpx#throws the function will throw - /// on error instead. - /// - /// \note The returned value is zero based and its maximum value is - /// smaller than the overall number of localities the current - /// application is running on (as returned by - /// \a get_num_localities()). - /// - /// \note As long as \a ec is not pre-initialized to \a hpx::throws this - /// function doesn't throw but returns the result code using the - /// parameter \a ec. Otherwise it throws an instance of - /// hpx::exception. - /// - /// \note This function needs to be executed on a HPX-thread. It will - /// fail otherwise (it will return -1). - HPX_API_EXPORT boost::uint32_t get_locality_id(error_code& ec = throws); - /////////////////////////////////////////////////////////////////////////// /// \brief Test whether the runtime system is currently being started. /// @@ -1012,6 +894,7 @@ namespace hpx #include #include #include +#include #include #include #include diff --git a/hpx/lcos/base_lco.hpp b/hpx/lcos/base_lco.hpp index 723ecccb8c14..8be4c2cc821d 100644 --- a/hpx/lcos/base_lco.hpp +++ b/hpx/lcos/base_lco.hpp @@ -6,7 +6,7 @@ #if !defined(HPX_LCOS_BASE_LCO_JUN_12_2008_0852PM) #define HPX_LCOS_BASE_LCO_JUN_12_2008_0852PM -#include +#include #include #include #include diff --git a/hpx/lcos/base_lco_with_value.hpp b/hpx/lcos/base_lco_with_value.hpp index a374e48e24f2..230d1fb3940b 100644 --- a/hpx/lcos/base_lco_with_value.hpp +++ b/hpx/lcos/base_lco_with_value.hpp @@ -6,7 +6,7 @@ #if !defined(HPX_LCOS_BASE_LCO_WITH_VALUE_HPP) #define HPX_LCOS_BASE_LCO_WITH_VALUE_HPP -#include +#include #include #include #include diff --git a/hpx/plugins/parcelport/tcp/connection_handler.hpp b/hpx/plugins/parcelport/tcp/connection_handler.hpp index 2ec92e3da942..c19c6551bdce 100644 --- a/hpx/plugins/parcelport/tcp/connection_handler.hpp +++ b/hpx/plugins/parcelport/tcp/connection_handler.hpp @@ -11,6 +11,7 @@ #define HPX_PARCELSET_POLICIES_TCP_CONNECTION_HANDLER_HPP #include +#include #include #include diff --git a/hpx/plugins/parcelport/tcp/locality.hpp b/hpx/plugins/parcelport/tcp/locality.hpp index 995dca273126..f3884ee3d2eb 100644 --- a/hpx/plugins/parcelport/tcp/locality.hpp +++ b/hpx/plugins/parcelport/tcp/locality.hpp @@ -10,6 +10,7 @@ #ifndef HPX_PARCELSET_POLICIES_TCP_LOCALITY_HPP #define HPX_PARCELSET_POLICIES_TCP_LOCALITY_HPP +#include #include #include #include diff --git a/hpx/plugins/parcelport/tcp/receiver.hpp b/hpx/plugins/parcelport/tcp/receiver.hpp index 500eda36b793..3d5534497738 100644 --- a/hpx/plugins/parcelport/tcp/receiver.hpp +++ b/hpx/plugins/parcelport/tcp/receiver.hpp @@ -12,6 +12,7 @@ #ifndef HPX_PARCELSET_POLICIES_TCP_RECEIVER_HPP #define HPX_PARCELSET_POLICIES_TCP_RECEIVER_HPP +#include #include #include #include diff --git a/hpx/plugins/parcelport/tcp/sender.hpp b/hpx/plugins/parcelport/tcp/sender.hpp index 0ad27534e647..49850af07693 100644 --- a/hpx/plugins/parcelport/tcp/sender.hpp +++ b/hpx/plugins/parcelport/tcp/sender.hpp @@ -9,6 +9,7 @@ #ifndef HPX_PARCELSET_POLICIES_TCP_SENDER_HPP #define HPX_PARCELSET_POLICIES_TCP_SENDER_HPP +#include #include #include #include diff --git a/hpx/runtime/actions/continuation.hpp b/hpx/runtime/actions/continuation.hpp index 3c6d77c0139e..7563889dc9f3 100644 --- a/hpx/runtime/actions/continuation.hpp +++ b/hpx/runtime/actions/continuation.hpp @@ -11,6 +11,8 @@ #include #include #include +#include +#include #include #include #include @@ -40,12 +42,6 @@ /////////////////////////////////////////////////////////////////////////////// namespace hpx { - namespace actions - { - template - struct basic_action; - } - ////////////////////////////////////////////////////////////////////////// // forward declare the required overload of apply. template @@ -75,7 +71,7 @@ namespace hpx >::set_value_action set_value_action; if (move_credits) { - naming::id_type target(id.get_gid(), id_type::managed_move_credit); + naming::id_type target(id.get_gid(), naming::id_type::managed_move_credit); id.make_unmanaged(); apply(target, util::detail::make_temporary(t)); @@ -95,7 +91,7 @@ namespace hpx >::set_value_action set_value_action; if (move_credits) { - naming::id_type target(id.get_gid(), id_type::managed_move_credit); + naming::id_type target(id.get_gid(), naming::id_type::managed_move_credit); id.make_unmanaged(); apply_c(cont, target, @@ -115,8 +111,6 @@ namespace hpx /////////////////////////////////////////////////////////////////////////////// namespace hpx { namespace actions { - class HPX_EXPORT continuation; - namespace detail { template @@ -242,7 +236,7 @@ namespace hpx { namespace actions }; template - BOOST_FORCEINLINE T operator()(id_type const& lco, T && t) const + BOOST_FORCEINLINE T operator()(naming::id_type const& lco, T && t) const { hpx::set_lco_value(lco, std::forward(t)); @@ -272,21 +266,21 @@ namespace hpx { namespace actions continuation_impl() {} template - continuation_impl(Cont_ && cont, hpx::id_type const& target) + continuation_impl(Cont_ && cont, hpx::naming::id_type const& target) : cont_(std::forward(cont)), target_(target) {} virtual ~continuation_impl() {} template - typename result::type - operator()(hpx::id_type const& lco, T && t) const + typename result::type + operator()(hpx::naming::id_type const& lco, T && t) const { hpx::apply_c(cont_, lco, target_, std::forward(t)); // Unfortunately we need to default construct the return value, // this possibly imposes an additional restriction of return types. - typedef typename result::type + typedef typename result::type result_type; return result_type(); } @@ -302,7 +296,7 @@ namespace hpx { namespace actions } cont_type cont_; - hpx::id_type target_; + hpx::naming::id_type target_; }; /////////////////////////////////////////////////////////////////////////// @@ -324,14 +318,14 @@ namespace hpx { namespace actions cont_type(T1, T2) >::type result_type; typedef typename util::result_of< - function_type(hpx::id_type, result_type) + function_type(hpx::naming::id_type, result_type) >::type type; }; continuation2_impl() {} template - continuation2_impl(Cont_ && cont, hpx::id_type const& target, + continuation2_impl(Cont_ && cont, hpx::naming::id_type const& target, F_ && f) : cont_(std::forward(cont)), target_(target), @@ -341,8 +335,8 @@ namespace hpx { namespace actions virtual ~continuation2_impl() {} template - typename result::type - operator()(hpx::id_type const& lco, T && t) const + typename result::type + operator()(hpx::naming::id_type const& lco, T && t) const { using hpx::util::placeholders::_2; hpx::apply_continue(cont_, hpx::util::bind(f_, lco, _2), @@ -350,7 +344,7 @@ namespace hpx { namespace actions // Unfortunately we need to default construct the return value, // this possibly imposes an additional restriction of return types. - typedef typename result::type + typedef typename result::type result_type; return result_type(); } @@ -366,7 +360,7 @@ namespace hpx { namespace actions } cont_type cont_; // continuation type - hpx::id_type target_; + hpx::naming::id_type target_; function_type f_; // set_value action (default: set_lco_value_continuation) }; @@ -619,7 +613,7 @@ namespace hpx inline hpx::actions::continuation_impl< typename util::decay::type > - make_continuation(Cont && f, hpx::id_type const& target) + make_continuation(Cont && f, hpx::naming::id_type const& target) { typedef typename util::decay::type cont_type; return hpx::actions::continuation_impl( @@ -651,7 +645,7 @@ namespace hpx typename util::decay::type, typename util::decay::type > - make_continuation(Cont && cont, hpx::id_type const& target, + make_continuation(Cont && cont, hpx::naming::id_type const& target, F && f) { typedef typename util::decay::type cont_type; diff --git a/hpx/runtime/actions/continuation_fwd.hpp b/hpx/runtime/actions/continuation_fwd.hpp new file mode 100644 index 000000000000..125dfe29270c --- /dev/null +++ b/hpx/runtime/actions/continuation_fwd.hpp @@ -0,0 +1,17 @@ +// Copyright (c) 2007-2015 Hartmut Kaiser +// +// 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_RUNTIME_ACTIONS_CONTINUATION_HPP) +#define HPX_RUNTIME_ACTIONS_CONTINUATION_HPP + +#include + +namespace hpx { namespace actions +{ + class HPX_EXPORT continuation; +}} + +#endif + diff --git a/hpx/runtime/actions/transfer_action.hpp b/hpx/runtime/actions/transfer_action.hpp index 200da296a63a..e2087d0926c5 100644 --- a/hpx/runtime/actions/transfer_action.hpp +++ b/hpx/runtime/actions/transfer_action.hpp @@ -10,8 +10,8 @@ #if !defined(HPX_RUNTIME_ACTIONS_TRANSFER_ACTION_NOV_14_2008_0711PM) #define HPX_RUNTIME_ACTIONS_TRANSFER_ACTION_NOV_14_2008_0711PM -#include #include +#include #include #include #include diff --git a/hpx/runtime/agas/request.hpp b/hpx/runtime/agas/request.hpp index 1e1e03b2cc66..1a62d0da47ea 100644 --- a/hpx/runtime/agas/request.hpp +++ b/hpx/runtime/agas/request.hpp @@ -10,7 +10,7 @@ #if !defined(HPX_AB01A9FE_45BE_43EF_B9AD_05B701B06685) #define HPX_AB01A9FE_45BE_43EF_B9AD_05B701B06685 -#include +#include #include #include #include diff --git a/hpx/runtime/agas/response.hpp b/hpx/runtime/agas/response.hpp index 98a7f6c0b875..7caa230bb72d 100644 --- a/hpx/runtime/agas/response.hpp +++ b/hpx/runtime/agas/response.hpp @@ -9,7 +9,7 @@ #if !defined(HPX_FB40C7A4_33B0_4C64_A16B_2A3FEEB237ED) #define HPX_FB40C7A4_33B0_4C64_A16B_2A3FEEB237ED -#include +#include #include #include #include diff --git a/hpx/runtime/agas_fwd.hpp b/hpx/runtime/agas_fwd.hpp new file mode 100644 index 000000000000..49d154b48c09 --- /dev/null +++ b/hpx/runtime/agas_fwd.hpp @@ -0,0 +1,28 @@ +// Copyright (c) 2007-2014 Hartmut Kaiser +// Copyright (c) 2011 Bryce Lelbach +// +// 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) + +/// \file agas_fwd.hpp + +#ifndef HPX_RUNTIME_AGAS_FWD_HPP +#define HPX_RUNTIME_AGAS_FWD_HPP + +#include + +namespace hpx { + namespace agas + { + struct HPX_API_EXPORT addressing_service; + + enum service_mode + { + service_mode_invalid = -1, + service_mode_bootstrap = 0, + service_mode_hosted = 1 + }; + } +} + +#endif diff --git a/hpx/runtime/applier/applier.hpp b/hpx/runtime/applier/applier.hpp index 28691e945c7a..df75e262906e 100644 --- a/hpx/runtime/applier/applier.hpp +++ b/hpx/runtime/applier/applier.hpp @@ -10,13 +10,18 @@ #include #include +#include +#include +#include #include #include -#include +#include +#include #include +#include -#include +#include #include @@ -43,7 +48,7 @@ namespace hpx { namespace applier /// /// This function returns a reference to the resolver client this /// applier instance has been created with. - naming::resolver_client& get_agas_client(); + agas::addressing_service& get_agas_client(); /// \brief Access the \a parcelhandler instance associated with this /// \a applier diff --git a/hpx/runtime/applier/bind_naming_wrappers.hpp b/hpx/runtime/applier/bind_naming_wrappers.hpp index 02ce91be543d..530fee1993cc 100644 --- a/hpx/runtime/applier/bind_naming_wrappers.hpp +++ b/hpx/runtime/applier/bind_naming_wrappers.hpp @@ -6,7 +6,8 @@ #if !defined(HPX_RUNTIME_APPLIER_BIND_NAMING_WRAPPERS_MAY_26_20111234PM) #define HPX_RUNTIME_APPLIER_BIND_NAMING_WRAPPERS_MAY_26_20111234PM -#include +#include +#include #include #include diff --git a/hpx/runtime/components/client_base.hpp b/hpx/runtime/components/client_base.hpp index f77c5f2705b7..f9fb7d9f8a50 100644 --- a/hpx/runtime/components/client_base.hpp +++ b/hpx/runtime/components/client_base.hpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include diff --git a/hpx/runtime/components/server/wrapper_heap.hpp b/hpx/runtime/components/server/wrapper_heap.hpp index d99e43aceb5b..df431fa4b548 100644 --- a/hpx/runtime/components/server/wrapper_heap.hpp +++ b/hpx/runtime/components/server/wrapper_heap.hpp @@ -7,16 +7,7 @@ #if !defined(HPX_UTIL_WRAPPER_HEAP_JUN_12_2008_0904AM) #define HPX_UTIL_WRAPPER_HEAP_JUN_12_2008_0904AM -#include -#include -#include - -#include -#include -#include - #include -#include #include #include #include @@ -27,6 +18,14 @@ #include #include +#include +#include +#include + +#include +#include +#include + /////////////////////////////////////////////////////////////////////////////// namespace hpx { namespace components { namespace detail { diff --git a/hpx/runtime/find_here.hpp b/hpx/runtime/find_here.hpp new file mode 100644 index 000000000000..2d0ce1eb0195 --- /dev/null +++ b/hpx/runtime/find_here.hpp @@ -0,0 +1,47 @@ +// Copyright (c) 2007-2014 Hartmut Kaiser +// Copyright (c) 2011 Bryce Lelbach +// +// 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) + +/// \file find_here.hpp + +#ifndef HPX_RUNTIME_FIND_HERE_HPP +#define HPX_RUNTIME_FIND_HERE_HPP + +#include +#include +#include + +namespace hpx { + /////////////////////////////////////////////////////////////////////////// + /// \brief Return the global id representing this locality + /// + /// The function \a find_here() can be used to retrieve the global id + /// usable to refer to the current locality. + /// + /// \param ec [in,out] this represents the error status on exit, if this + /// is pre-initialized to \a hpx#throws the function will throw + /// on error instead. + /// + /// \note Generally, the id of a locality can be used for instance to + /// create new instances of components and to invoke plain actions + /// (global functions). + /// + /// \returns The global id representing the locality this function has + /// been called on. + /// + /// \note As long as \a ec is not pre-initialized to \a hpx::throws this + /// function doesn't throw but returns the result code using the + /// parameter \a ec. Otherwise it throws an instance of + /// hpx::exception. + /// + /// \note This function will return meaningful results only if called + /// from an HPX-thread. It will return \a hpx::naming::invalid_id + /// otherwise. + /// + /// \see \a hpx::find_all_localities(), \a hpx::find_locality() + HPX_API_EXPORT naming::id_type find_here(error_code& ec = throws); +} + +#endif diff --git a/hpx/runtime/get_locality_id.hpp b/hpx/runtime/get_locality_id.hpp new file mode 100644 index 000000000000..65fd1321dda7 --- /dev/null +++ b/hpx/runtime/get_locality_id.hpp @@ -0,0 +1,44 @@ +// Copyright (c) 2007-2014 Hartmut Kaiser +// Copyright (c) 2011 Bryce Lelbach +// +// 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) + +/// \file get_locality_id.hpp + +#ifndef HPX_RUNTIME_GET_LOCALITY_ID_HPP +#define HPX_RUNTIME_GET_LOCALITY_ID_HPP + +#include + +#include + +#include + +namespace hpx { + /////////////////////////////////////////////////////////////////////////// + /// \brief Return the number of the locality this function is being called + /// from. + /// + /// This function returns the id of the current locality. + /// + /// \param ec [in,out] this represents the error status on exit, if this + /// is pre-initialized to \a hpx#throws the function will throw + /// on error instead. + /// + /// \note The returned value is zero based and its maximum value is + /// smaller than the overall number of localities the current + /// application is running on (as returned by + /// \a get_num_localities()). + /// + /// \note As long as \a ec is not pre-initialized to \a hpx::throws this + /// function doesn't throw but returns the result code using the + /// parameter \a ec. Otherwise it throws an instance of + /// hpx::exception. + /// + /// \note This function needs to be executed on a HPX-thread. It will + /// fail otherwise (it will return -1). + HPX_API_EXPORT boost::uint32_t get_locality_id(error_code& ec = throws); +} + +#endif diff --git a/hpx/runtime/naming/id_type.hpp b/hpx/runtime/naming/id_type.hpp index 149e5855b192..e686685b554d 100644 --- a/hpx/runtime/naming/id_type.hpp +++ b/hpx/runtime/naming/id_type.hpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/hpx/runtime/parcelset/locality.hpp b/hpx/runtime/parcelset/locality.hpp index a253362e42ff..ce79c6f23b16 100644 --- a/hpx/runtime/parcelset/locality.hpp +++ b/hpx/runtime/parcelset/locality.hpp @@ -10,7 +10,6 @@ #include -#include #include #include #include diff --git a/hpx/runtime/parcelset_fwd.hpp b/hpx/runtime/parcelset_fwd.hpp new file mode 100644 index 000000000000..a36a5b0413c6 --- /dev/null +++ b/hpx/runtime/parcelset_fwd.hpp @@ -0,0 +1,40 @@ +// Copyright (c) 2007-2014 Hartmut Kaiser +// Copyright (c) 2011 Bryce Lelbach +// +// 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) + +/// \file parcelset_fwd.hpp + +#ifndef HPX_RUNTIME_PARCELSET_FWD_HPP +#define HPX_RUNTIME_PARCELSET_FWD_HPP + +#include +#include + +namespace hpx { + /////////////////////////////////////////////////////////////////////////// + /// \namespace parcelset + namespace parcelset + { + class HPX_API_EXPORT locality; + + class HPX_API_EXPORT parcel; + class HPX_API_EXPORT parcelport; + class HPX_API_EXPORT parcelhandler; + + namespace policies + { + struct message_handler; + } + + HPX_API_EXPORT policies::message_handler* get_message_handler( + parcelhandler* ph, char const* name, char const* type, + std::size_t num, std::size_t interval, locality const& l, + error_code& ec = throws); + + HPX_API_EXPORT bool do_background_work(std::size_t num_thread = 0); + } +} + +#endif diff --git a/hpx/runtime/runtime_mode.hpp b/hpx/runtime/runtime_mode.hpp new file mode 100644 index 000000000000..d06d6e73798d --- /dev/null +++ b/hpx/runtime/runtime_mode.hpp @@ -0,0 +1,37 @@ +// Copyright (c) 2007-2014 Hartmut Kaiser +// Copyright (c) 2011 Bryce Lelbach +// +// 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) + +/// \file runtime_mode.hpp + +#ifndef HPX_RUNTIME_RUNTIME_MODE_HPP +#define HPX_RUNTIME_RUNTIME_MODE_HPP + +#include + +#include + +namespace hpx { + /// A HPX runtime can be executed in two different modes: console mode + /// and worker mode. + enum runtime_mode + { + runtime_mode_invalid = -1, + runtime_mode_console = 0, ///< The runtime is the console locality + runtime_mode_worker = 1, ///< The runtime is a worker locality + runtime_mode_connect = 2, ///< The runtime is a worker locality + ///< connecting late + runtime_mode_default = 3, ///< The runtime mode will be determined + ///< based on the command line arguments + runtime_mode_last + }; + + /// Get the readable string representing the name of the given runtime_mode + /// constant. + HPX_API_EXPORT char const* get_runtime_mode_name(runtime_mode state); + HPX_API_EXPORT runtime_mode get_runtime_mode_from_name(std::string const& mode); +} + +#endif diff --git a/hpx/runtime/serialization/binary_filter.hpp b/hpx/runtime/serialization/binary_filter.hpp index 846fb152770b..a0e76aa0a2d8 100644 --- a/hpx/runtime/serialization/binary_filter.hpp +++ b/hpx/runtime/serialization/binary_filter.hpp @@ -8,7 +8,7 @@ #if !defined(HPX_SERIALIZATION_BINARY_FILTER_MAR_09_2015_0414PM) #define HPX_SERIALIZATION_BINARY_FILTER_MAR_09_2015_0414PM -#include +#include #include namespace hpx { namespace serialization diff --git a/hpx/runtime/serialization/serialization_fwd.hpp b/hpx/runtime/serialization/serialization_fwd.hpp index c03ba122236d..21db4deb1de0 100644 --- a/hpx/runtime/serialization/serialization_fwd.hpp +++ b/hpx/runtime/serialization/serialization_fwd.hpp @@ -32,8 +32,10 @@ namespace hpx { namespace serialization #endif } + class access; struct input_archive; struct output_archive; + struct binary_filter; BOOST_FORCEINLINE void register_pointer(input_archive & ar, boost::uint64_t pos, diff --git a/hpx/runtime/threads/detail/periodic_maintenance.hpp b/hpx/runtime/threads/detail/periodic_maintenance.hpp index eef46ecb27ec..166522389656 100644 --- a/hpx/runtime/threads/detail/periodic_maintenance.hpp +++ b/hpx/runtime/threads/detail/periodic_maintenance.hpp @@ -7,6 +7,7 @@ #define HPX_RUNTIME_THREADS_DETAIL_PERIODIC_MAINTENANCE_JAN_11_2015_0626PM #include +#include #include #include #include diff --git a/hpx/runtime/threads/detail/set_thread_state.hpp b/hpx/runtime/threads/detail/set_thread_state.hpp index 3ed063a8efeb..8d843891c561 100644 --- a/hpx/runtime/threads/detail/set_thread_state.hpp +++ b/hpx/runtime/threads/detail/set_thread_state.hpp @@ -6,6 +6,7 @@ #if !defined(HPX_RUNTIME_THREADS_DETAIL_SET_THREAD_STATE_JAN_13_2013_0518PM) #define HPX_RUNTIME_THREADS_DETAIL_SET_THREAD_STATE_JAN_13_2013_0518PM +#include #include #include #include diff --git a/hpx/runtime/threads/thread_init_data.hpp b/hpx/runtime/threads/thread_init_data.hpp index 0ae69a9c74b8..e24142c30eba 100644 --- a/hpx/runtime/threads/thread_init_data.hpp +++ b/hpx/runtime/threads/thread_init_data.hpp @@ -7,7 +7,7 @@ #if !defined(HPX_THREAD_INIT_DATA_SEP_22_2009_1034AM) #define HPX_THREAD_INIT_DATA_SEP_22_2009_1034AM -#include +#include #include #include #include diff --git a/hpx/runtime/threads/topology.hpp b/hpx/runtime/threads/topology.hpp index 4e4cc3755314..837a3a3cc16a 100644 --- a/hpx/runtime/threads/topology.hpp +++ b/hpx/runtime/threads/topology.hpp @@ -10,7 +10,7 @@ #if !defined(HPX_E43E0AF0_8A9D_4870_8CC7_E5AD53EF4798) #define HPX_E43E0AF0_8A9D_4870_8CC7_E5AD53EF4798 -#include +#include #include #include diff --git a/hpx/traits/action_capability_provider.hpp b/hpx/traits/action_capability_provider.hpp index 30e8add8f640..5ee366cf8194 100644 --- a/hpx/traits/action_capability_provider.hpp +++ b/hpx/traits/action_capability_provider.hpp @@ -6,10 +6,11 @@ #if !defined(HPX_TRAITS_ACTION_CAPABILITY_PROVIDER_JUN_09_2013_1257PM) #define HPX_TRAITS_ACTION_CAPABILITY_PROVIDER_JUN_09_2013_1257PM -#include +#include #if defined(HPX_HAVE_SECURITY) #include +#include #include namespace hpx { namespace traits diff --git a/hpx/traits/action_decorate_continuation.hpp b/hpx/traits/action_decorate_continuation.hpp index f3adea397ad6..90ac71490607 100644 --- a/hpx/traits/action_decorate_continuation.hpp +++ b/hpx/traits/action_decorate_continuation.hpp @@ -6,7 +6,7 @@ #if !defined(HPX_TRAITS_ACTION_DECORATE_CONTINUATION_MAR_30_2014_0725PM) #define HPX_TRAITS_ACTION_DECORATE_CONTINUATION_MAR_30_2014_0725PM -#include +#include #include #include diff --git a/hpx/traits/action_decorate_function.hpp b/hpx/traits/action_decorate_function.hpp index d7d230d04521..6ff253d99711 100644 --- a/hpx/traits/action_decorate_function.hpp +++ b/hpx/traits/action_decorate_function.hpp @@ -6,7 +6,6 @@ #if !defined(HPX_TRAITS_ACTION_DECORATE_FUNCTION_MAR_30_2014_1054AM) #define HPX_TRAITS_ACTION_DECORATE_FUNCTION_MAR_30_2014_1054AM -#include #include #include diff --git a/hpx/traits/action_does_termination_detection.hpp b/hpx/traits/action_does_termination_detection.hpp index 09a99e66eecf..5e6f0297dbcd 100644 --- a/hpx/traits/action_does_termination_detection.hpp +++ b/hpx/traits/action_does_termination_detection.hpp @@ -6,7 +6,6 @@ #if !defined(HPX_TRAITS_ACTION_DOES_TERMINATION_DETECTION_MAR_21_2014_0818PM) #define HPX_TRAITS_ACTION_DOES_TERMINATION_DETECTION_MAR_21_2014_0818PM -#include #include namespace hpx { namespace traits diff --git a/hpx/traits/action_is_target_valid.hpp b/hpx/traits/action_is_target_valid.hpp index 88ea050de2f1..b8982718d0de 100644 --- a/hpx/traits/action_is_target_valid.hpp +++ b/hpx/traits/action_is_target_valid.hpp @@ -6,7 +6,7 @@ #if !defined(HPX_TRAITS_ACTION_IS_TARGET_VALID_MAR_10_2014_1103AM) #define HPX_TRAITS_ACTION_IS_TARGET_VALID_MAR_10_2014_1103AM -#include +#include #include namespace hpx { namespace traits diff --git a/hpx/traits/action_message_handler.hpp b/hpx/traits/action_message_handler.hpp index 017bd41a19f0..45051e4668f6 100644 --- a/hpx/traits/action_message_handler.hpp +++ b/hpx/traits/action_message_handler.hpp @@ -6,8 +6,7 @@ #if !defined(HPX_TRAITS_ACTION_MESSAGE_HANDLER_FEB_24_2013_0318PM) #define HPX_TRAITS_ACTION_MESSAGE_HANDLER_FEB_24_2013_0318PM -#include -#include +#include #include namespace hpx { namespace traits diff --git a/hpx/traits/action_priority.hpp b/hpx/traits/action_priority.hpp index c92002b7f7bb..79417b7aed19 100644 --- a/hpx/traits/action_priority.hpp +++ b/hpx/traits/action_priority.hpp @@ -6,7 +6,7 @@ #if !defined(HPX_TRAITS_ACTION_PRIORITY_SEP_03_2012_1138AM) #define HPX_TRAITS_ACTION_PRIORITY_SEP_03_2012_1138AM -#include +#include #include namespace hpx { namespace traits diff --git a/hpx/traits/action_schedule_thread.hpp b/hpx/traits/action_schedule_thread.hpp index cd69e191aa07..19a505bfa7cd 100644 --- a/hpx/traits/action_schedule_thread.hpp +++ b/hpx/traits/action_schedule_thread.hpp @@ -6,9 +6,9 @@ #if !defined(HPX_TRAITS_ACTION_SCHEDULE_THREAD_MAR_30_2014_0325PM) #define HPX_TRAITS_ACTION_SCHEDULE_THREAD_MAR_30_2014_0325PM -#include +#include +#include #include -#include #include namespace hpx { namespace traits diff --git a/hpx/traits/action_serialization_filter.hpp b/hpx/traits/action_serialization_filter.hpp index 6add90dde548..ae1f7aaa609b 100644 --- a/hpx/traits/action_serialization_filter.hpp +++ b/hpx/traits/action_serialization_filter.hpp @@ -6,8 +6,8 @@ #if !defined(HPX_TRAITS_ACTION_SERIALIZATION_FILTER_FEB_14_2013_0903PM) #define HPX_TRAITS_ACTION_SERIALIZATION_FILTER_FEB_14_2013_0903PM -#include -#include +#include +#include #include namespace hpx { namespace traits diff --git a/hpx/traits/action_stacksize.hpp b/hpx/traits/action_stacksize.hpp index da2ca26d3795..04f5db48b635 100644 --- a/hpx/traits/action_stacksize.hpp +++ b/hpx/traits/action_stacksize.hpp @@ -6,7 +6,7 @@ #if !defined(HPX_TRAITS_ACTION_STACKSIZE_SEP_03_2012_1136AM) #define HPX_TRAITS_ACTION_STACKSIZE_SEP_03_2012_1136AM -#include +#include #include namespace hpx { namespace traits diff --git a/hpx/traits/is_launch_policy.hpp b/hpx/traits/is_launch_policy.hpp index bec109f9fb2e..4159eeb10b65 100644 --- a/hpx/traits/is_launch_policy.hpp +++ b/hpx/traits/is_launch_policy.hpp @@ -8,6 +8,7 @@ #include #include +#include #include #include diff --git a/hpx/util/activate_counters.hpp b/hpx/util/activate_counters.hpp index 414d74df7838..80cb47667525 100644 --- a/hpx/util/activate_counters.hpp +++ b/hpx/util/activate_counters.hpp @@ -6,9 +6,8 @@ #if !defined(HPX_7B5783D6_FCA3_4E3D_BBCE_FBB0A6CF644B) #define HPX_7B5783D6_FCA3_4E3D_BBCE_FBB0A6CF644B -#include -#include -#include +#include +#include #include #include diff --git a/hpx/util/any.hpp b/hpx/util/any.hpp index 7f3f94e5c299..2b3672164e35 100644 --- a/hpx/util/any.hpp +++ b/hpx/util/any.hpp @@ -18,7 +18,7 @@ #pragma once #endif -#include +#include #include #include #include diff --git a/hpx/util/apex.hpp b/hpx/util/apex.hpp index 20e1cddeb44e..9077b92446f6 100644 --- a/hpx/util/apex.hpp +++ b/hpx/util/apex.hpp @@ -3,7 +3,7 @@ // 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) -#include +#include #ifdef HPX_HAVE_APEX #include diff --git a/hpx/util/asio_util.hpp b/hpx/util/asio_util.hpp index e714b7de5988..4aad6ba0e940 100644 --- a/hpx/util/asio_util.hpp +++ b/hpx/util/asio_util.hpp @@ -8,9 +8,10 @@ #define HPX_UTIL_ASIOUTIL_MAY_16_2008_1212PM #include +#include -#include #include +#include namespace hpx { namespace util { diff --git a/hpx/util/batch_environment.hpp b/hpx/util/batch_environment.hpp index 347040487789..f35a7b1c6041 100644 --- a/hpx/util/batch_environment.hpp +++ b/hpx/util/batch_environment.hpp @@ -7,8 +7,10 @@ #define HPX_UTIL_PBS_ENVIRONMENT_AUG_26_2011_0901AM #include +#include +#include -#include +#include #include #include diff --git a/hpx/util/batch_environments/pbs_environment.hpp b/hpx/util/batch_environments/pbs_environment.hpp index 17490cc2c629..7388ef52a128 100644 --- a/hpx/util/batch_environments/pbs_environment.hpp +++ b/hpx/util/batch_environments/pbs_environment.hpp @@ -7,11 +7,10 @@ #if !defined(HPX_UTIL_PBS_ENVIRONMENT_HPP) #define HPX_UTIL_PBS_ENVIRONMENT_HPP -#include +#include #include -#include #include #include diff --git a/hpx/util/bind_action.hpp b/hpx/util/bind_action.hpp index 736b672439dc..240606294115 100644 --- a/hpx/util/bind_action.hpp +++ b/hpx/util/bind_action.hpp @@ -8,7 +8,7 @@ #ifndef HPX_UTIL_BIND_ACTION_HPP #define HPX_UTIL_BIND_ACTION_HPP -#include +#include #include #include #include diff --git a/hpx/util/buffer_pool.hpp b/hpx/util/buffer_pool.hpp index 976fe216a0ca..0ddab73a83d5 100644 --- a/hpx/util/buffer_pool.hpp +++ b/hpx/util/buffer_pool.hpp @@ -6,8 +6,6 @@ #if !defined(HPX_UTIL_BUFFER_POOL_HPP) #define HPX_UTIL_BUFFER_POOL_HPP -#include - #include #include #include diff --git a/hpx/util/command_line_handling.hpp b/hpx/util/command_line_handling.hpp index 61ee77c8ed5f..f4d6efa44f63 100644 --- a/hpx/util/command_line_handling.hpp +++ b/hpx/util/command_line_handling.hpp @@ -6,13 +6,19 @@ #if !defined(HPX_UTIL_COMMAND_LINE_HANDLING_OCT_04_2012_0800AM) #define HPX_UTIL_COMMAND_LINE_HANDLING_OCT_04_2012_0800AM -#include +#include #include +#include #include +#include #include +#include #include +#include +#include + /////////////////////////////////////////////////////////////////////////////// namespace hpx { namespace util { diff --git a/hpx/util/connection_cache.hpp b/hpx/util/connection_cache.hpp index 3c86929024b4..288b17042d22 100644 --- a/hpx/util/connection_cache.hpp +++ b/hpx/util/connection_cache.hpp @@ -15,7 +15,7 @@ #if !defined(HPX_UTIL_CONNECTION_CACHE_MAY_20_0104PM) #define HPX_UTIL_CONNECTION_CACHE_MAY_20_0104PM -#include +#include #include #include #include diff --git a/hpx/util/coordinate.hpp b/hpx/util/coordinate.hpp index 21e1eee5da7d..03db2dfc802b 100644 --- a/hpx/util/coordinate.hpp +++ b/hpx/util/coordinate.hpp @@ -8,7 +8,7 @@ #if !defined(HPX_UTIL_COORDINATE_NOV_03_2014_0227PM) #define HPX_UTIL_COORDINATE_NOV_03_2014_0227PM -#include +#include #include #include diff --git a/hpx/util/coroutine/detail/context_posix.hpp b/hpx/util/coroutine/detail/context_posix.hpp index ab21be9932fe..2fb22c28f16d 100644 --- a/hpx/util/coroutine/detail/context_posix.hpp +++ b/hpx/util/coroutine/detail/context_posix.hpp @@ -45,6 +45,7 @@ #include #include +#include #include #include diff --git a/hpx/util/coroutine/detail/context_windows_fibers.hpp b/hpx/util/coroutine/detail/context_windows_fibers.hpp index 54234209c684..6c69ac5b10ea 100644 --- a/hpx/util/coroutine/detail/context_windows_fibers.hpp +++ b/hpx/util/coroutine/detail/context_windows_fibers.hpp @@ -38,6 +38,7 @@ #include #include #include +#include #include #include diff --git a/hpx/util/coroutine/detail/default_context_impl.hpp b/hpx/util/coroutine/detail/default_context_impl.hpp index a52eafeb275a..21a2a896214f 100644 --- a/hpx/util/coroutine/detail/default_context_impl.hpp +++ b/hpx/util/coroutine/detail/default_context_impl.hpp @@ -29,7 +29,7 @@ #ifndef HPX_COROUTINE_DEFAULT_CONTEXT_IMPL_HPP_20060601 #define HPX_COROUTINE_DEFAULT_CONTEXT_IMPL_HPP_20060601 -#include +#include #include /* diff --git a/hpx/util/coroutine/detail/posix_utility.hpp b/hpx/util/coroutine/detail/posix_utility.hpp index 95902b055175..1fd2c1249138 100644 --- a/hpx/util/coroutine/detail/posix_utility.hpp +++ b/hpx/util/coroutine/detail/posix_utility.hpp @@ -52,6 +52,8 @@ #include #include #include + +#include #endif #if defined(__FreeBSD__) diff --git a/hpx/util/functional/colocated_helpers.hpp b/hpx/util/functional/colocated_helpers.hpp index 5c11b7205e86..44b9f7aaec86 100644 --- a/hpx/util/functional/colocated_helpers.hpp +++ b/hpx/util/functional/colocated_helpers.hpp @@ -6,13 +6,15 @@ #if !defined(HPX_UTIL_DETAIL_COLOCATED_HELPERS_FEB_04_2014_0828PM) #define HPX_UTIL_DETAIL_COLOCATED_HELPERS_FEB_04_2014_0828PM -#include +#include +#include #include #include #include #include #include #include +#include #include diff --git a/hpx/util/generate_unique_ids.hpp b/hpx/util/generate_unique_ids.hpp index 98d89f2bce8e..cb4224776f3f 100644 --- a/hpx/util/generate_unique_ids.hpp +++ b/hpx/util/generate_unique_ids.hpp @@ -7,15 +7,12 @@ #if !defined(HPX_UTIL_GENERATE_UNIQUE_IDS_MAR_24_2008_1014AM) #define HPX_UTIL_GENERATE_UNIQUE_IDS_MAR_24_2008_1014AM -#include #include -#include -#include +#include #include #include -#include -#include +#include #if defined(BOOST_MSVC) #pragma warning(push) diff --git a/hpx/util/init_ini_data.hpp b/hpx/util/init_ini_data.hpp index 57f3210c0a3d..e0c740e62c4c 100644 --- a/hpx/util/init_ini_data.hpp +++ b/hpx/util/init_ini_data.hpp @@ -7,13 +7,17 @@ #if!defined(HPX_INIT_INI_DATA_SEP_26_2008_0344PM) #define HPX_INIT_INI_DATA_SEP_26_2008_0344PM -#include - -#include +#include #include #include #include +#include +#include + +#include +#include + /////////////////////////////////////////////////////////////////////////////// namespace hpx { namespace util { diff --git a/hpx/util/init_logging.hpp b/hpx/util/init_logging.hpp index 58b33e26d990..def786ce955a 100644 --- a/hpx/util/init_logging.hpp +++ b/hpx/util/init_logging.hpp @@ -6,8 +6,10 @@ #if !defined(HPX_UTIL_AGAS_INIT_LOGGING_SEP_07_2013_0754PM) #define HPX_UTIL_AGAS_INIT_LOGGING_SEP_07_2013_0754PM +#include +#include + #include -#include /////////////////////////////////////////////////////////////////////////////// namespace hpx { namespace util { namespace detail @@ -17,7 +19,7 @@ namespace hpx { namespace util { namespace detail struct init_logging { init_logging(runtime_configuration& ini, bool isconsole, - naming::resolver_client& agas_client); + agas::addressing_service& agas_client); }; }}} diff --git a/hpx/util/integer/int128.hpp b/hpx/util/integer/int128.hpp index b2e637fef5ec..9fd14b5b3b17 100644 --- a/hpx/util/integer/int128.hpp +++ b/hpx/util/integer/int128.hpp @@ -6,11 +6,11 @@ // 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) -#ifndef INT128_HPP -#define INT128_HPP +#ifndef HPX_UTIL_INTEGER_INT128_HPP +#define HPX_UTIL_INTEGER_INT128_HPP -#include -#include +#include +#include #include #include diff --git a/hpx/util/integer/uint128.hpp b/hpx/util/integer/uint128.hpp index 5b3dcd12bb19..54cca7fb06d6 100644 --- a/hpx/util/integer/uint128.hpp +++ b/hpx/util/integer/uint128.hpp @@ -6,11 +6,11 @@ // 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) -#ifndef UINT128_HPP -#define UINT128_HPP +#ifndef HPX_UTIL_INTEGER_UINT128_HPP +#define HPX_UTIL_INTEGER_UINT128_HPP -#include -#include +#include +#include #include #include diff --git a/hpx/util/io_service_pool.hpp b/hpx/util/io_service_pool.hpp index ae4893eb7181..bd15ba4f0928 100644 --- a/hpx/util/io_service_pool.hpp +++ b/hpx/util/io_service_pool.hpp @@ -10,7 +10,8 @@ #define HPX_UTIL_IO_SERVICE_POOL_MAR_26_2008_1218PM #include -#include +#include +#include #include #include diff --git a/hpx/util/manage_config.hpp b/hpx/util/manage_config.hpp index 44d3bdec9888..a745f33cacdc 100644 --- a/hpx/util/manage_config.hpp +++ b/hpx/util/manage_config.hpp @@ -6,13 +6,12 @@ #if !defined(HPX_UTIL_MANAGE_CONFIG_APR_11_2012_0519PM) #define HPX_UTIL_MANAGE_CONFIG_APR_11_2012_0519PM -#include +#include #include -#include - #include #include +#include #include diff --git a/hpx/util/map_hostnames.hpp b/hpx/util/map_hostnames.hpp index aa5f80aa9e52..b5e2e42ab831 100644 --- a/hpx/util/map_hostnames.hpp +++ b/hpx/util/map_hostnames.hpp @@ -6,11 +6,12 @@ #if !defined(HPX_UTIL_MAP_HOSTNAMES_AUG_29_2011_1257PM) #define HPX_UTIL_MAP_HOSTNAMES_AUG_29_2011_1257PM -#include +#include + +#include #include -#include -#include +#include #if defined(BOOST_MSVC) #pragma warning(push) diff --git a/hpx/util/one_size_heap_list.hpp b/hpx/util/one_size_heap_list.hpp index fab9bfb3df78..e34f842a18d3 100644 --- a/hpx/util/one_size_heap_list.hpp +++ b/hpx/util/one_size_heap_list.hpp @@ -7,24 +7,21 @@ #if !defined(HPX_041EF599_BA27_47ED_B1F0_2691B28966B3) #define HPX_041EF599_BA27_47ED_B1F0_2691B28966B3 -#include -#include - -#include -#include -#include -#include -#include -#include - #include -#include #include #include #include +#include #include #include +#include +#include +#include + +#include +#include + /////////////////////////////////////////////////////////////////////////////// namespace hpx { namespace util { diff --git a/hpx/util/parse_command_line.hpp b/hpx/util/parse_command_line.hpp index 2f0c3b6cbced..e0840afad9d0 100644 --- a/hpx/util/parse_command_line.hpp +++ b/hpx/util/parse_command_line.hpp @@ -6,9 +6,15 @@ #if !defined(HPX_UTIL_PARSE_COMMAND_LINE_NOV_30_2011_0652PM) #define HPX_UTIL_PARSE_COMMAND_LINE_NOV_30_2011_0652PM -#include +#include +#include +#include + #include +#include +#include + /////////////////////////////////////////////////////////////////////////////// namespace hpx { namespace util { diff --git a/hpx/util/query_counters.hpp b/hpx/util/query_counters.hpp index be844fcbd293..e66980caa447 100644 --- a/hpx/util/query_counters.hpp +++ b/hpx/util/query_counters.hpp @@ -6,16 +6,17 @@ #if !defined(HPX_UTIL_QUERY_COUNTERS_SEP_27_2011_0255PM) #define HPX_UTIL_QUERY_COUNTERS_SEP_27_2011_0255PM -#include +#include +#include #include #include #include +#include + #include #include -#include - #include namespace hpx { namespace util diff --git a/hpx/util/remove_local_destinations.hpp b/hpx/util/remove_local_destinations.hpp index dcdd3a2194ae..6a5e42606dc6 100644 --- a/hpx/util/remove_local_destinations.hpp +++ b/hpx/util/remove_local_destinations.hpp @@ -6,7 +6,6 @@ #if !defined(HPX_UTIL_REMOVE_LOCAL_DESTINATIONS_JUL_16_2012_1119AM) #define HPX_UTIL_REMOVE_LOCAL_DESTINATIONS_JUL_16_2012_1119AM -#include #include #include #include diff --git a/hpx/util/runtime_configuration.hpp b/hpx/util/runtime_configuration.hpp index d8b375243d00..3d90d44e423f 100644 --- a/hpx/util/runtime_configuration.hpp +++ b/hpx/util/runtime_configuration.hpp @@ -7,15 +7,19 @@ #if !defined(HPX_UTIL_RUNTIME_CONFIGURATION_OCT_02_2008_0530PM) #define HPX_UTIL_RUNTIME_CONFIGURATION_OCT_02_2008_0530PM -#include -#include - -#include +#include +#include #include +#include #include #include #include +#include + +#include +#include + /////////////////////////////////////////////////////////////////////////////// namespace hpx { namespace util { diff --git a/hpx/util/security/root_certificate_authority.hpp b/hpx/util/security/root_certificate_authority.hpp index 1979fd089250..5bbc33b22f43 100644 --- a/hpx/util/security/root_certificate_authority.hpp +++ b/hpx/util/security/root_certificate_authority.hpp @@ -6,11 +6,15 @@ #if !defined(HPX_UTIL_ROOT_CERTIFICATE_AUTHORITY_MAY_30_2013_0405PM) #define HPX_UTIL_ROOT_CERTIFICATE_AUTHORITY_MAY_30_2013_0405PM +#include + #if defined(HPX_HAVE_SODIUM) -#include +#include +#include #include #include +#include #include namespace hpx { namespace util { namespace security diff --git a/hpx/util/security/subordinate_certificate_authority.hpp b/hpx/util/security/subordinate_certificate_authority.hpp index d07e49e6922f..a2e53607f746 100644 --- a/hpx/util/security/subordinate_certificate_authority.hpp +++ b/hpx/util/security/subordinate_certificate_authority.hpp @@ -6,14 +6,19 @@ #if !defined(HPX_UTIL_SECURITY_SUB_CERTIFICATE_AUTHORITY_MAY_30_2013_0415PM) #define HPX_UTIL_SECURITY_SUB_CERTIFICATE_AUTHORITY_MAY_30_2013_0415PM +#include + #if defined(HPX_HAVE_SODIUM) -#include +#include +#include #include #include #include +#include + namespace hpx { namespace util { namespace security { class HPX_EXPORT subordinate_certificate_authority diff --git a/hpx/util/serialize_exception.hpp b/hpx/util/serialize_exception.hpp index 34ef24dd0337..4be0fc8eb17a 100644 --- a/hpx/util/serialize_exception.hpp +++ b/hpx/util/serialize_exception.hpp @@ -6,12 +6,8 @@ #if !defined(HPX_UTIL_SERIALIZE_EXCEPTION_JAN_23_2009_0108PM) #define HPX_UTIL_SERIALIZE_EXCEPTION_JAN_23_2009_0108PM -#include -#include -#include -#include +#include -#include #include namespace hpx { namespace util diff --git a/hpx/util/thread_aware_timer.hpp b/hpx/util/thread_aware_timer.hpp index 00011e59b576..63b076587018 100644 --- a/hpx/util/thread_aware_timer.hpp +++ b/hpx/util/thread_aware_timer.hpp @@ -6,13 +6,12 @@ #if !defined(HPX_UTIL_THREAD_AWARE_TIMER_AUG_17_2012_0745PM) #define HPX_UTIL_THREAD_AWARE_TIMER_AUG_17_2012_0745PM -#include +#include #include #include #include #include -#include namespace hpx { namespace util { diff --git a/hpx/util/thread_mapper.hpp b/hpx/util/thread_mapper.hpp index e8036f9c9d7c..d4ddac3a5c0d 100644 --- a/hpx/util/thread_mapper.hpp +++ b/hpx/util/thread_mapper.hpp @@ -6,7 +6,7 @@ #if !defined(HPX_UTIL_PAPI_THREAD_MAPPER_FEB_17_2012_0109PM) #define HPX_UTIL_PAPI_THREAD_MAPPER_FEB_17_2012_0109PM -#include +#include #include #include diff --git a/src/components/papi_counters/util/papi.cpp b/src/components/papi_counters/util/papi.cpp index 3efff7ae0c53..f910b257360e 100644 --- a/src/components/papi_counters/util/papi.cpp +++ b/src/components/papi_counters/util/papi.cpp @@ -3,21 +3,22 @@ // 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) -#include +#include #if defined(HPX_HAVE_PAPI) -#include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include -#include +#include #define NS_STR "hpx::performance_counters::papi::util::" diff --git a/src/hpx_init.cpp b/src/hpx_init.cpp index f98a31f42ce1..82908408280d 100644 --- a/src/hpx_init.cpp +++ b/src/hpx_init.cpp @@ -38,7 +38,6 @@ #include #include -#include #include #include #include diff --git a/src/runtime/parcelset/parcelhandler.cpp b/src/runtime/parcelset/parcelhandler.cpp index bfdda5b229a3..0c086dddb2e9 100644 --- a/src/runtime/parcelset/parcelhandler.cpp +++ b/src/runtime/parcelset/parcelhandler.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -24,9 +25,9 @@ #include +#include #include #include -#include #include #include #include diff --git a/src/runtime/threads/executors/service_executor.cpp b/src/runtime/threads/executors/service_executor.cpp index 02511425f4ce..bdeff61aeede 100644 --- a/src/runtime/threads/executors/service_executor.cpp +++ b/src/runtime/threads/executors/service_executor.cpp @@ -4,6 +4,7 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) #include +#include #include #include #include diff --git a/src/util/asio_util.cpp b/src/util/asio_util.cpp index 6324dd96f4cc..270d5372eada 100644 --- a/src/util/asio_util.cpp +++ b/src/util/asio_util.cpp @@ -4,17 +4,21 @@ // 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) -#include +#include #include #include +#include +#include #include +#include +#include +#include #include -#include -#include #include #include +#include #include /////////////////////////////////////////////////////////////////////////////// diff --git a/src/util/batch_environment.cpp b/src/util/batch_environment.cpp index c4de041f4db3..a61f431e9a96 100644 --- a/src/util/batch_environment.cpp +++ b/src/util/batch_environment.cpp @@ -4,25 +4,21 @@ // 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) -#include #include +#include #include - +#include #include #include #include #include -#include #include -#include -#include +#include #include -#include -#include namespace hpx { namespace util { diff --git a/src/util/command_line_handling.cpp b/src/util/command_line_handling.cpp index ba98392cb8d2..722074237c5a 100644 --- a/src/util/command_line_handling.cpp +++ b/src/util/command_line_handling.cpp @@ -5,7 +5,9 @@ #include #include +#include #include +#include #include #include #include @@ -18,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/util/coroutine/detail/tss.cpp b/src/util/coroutine/detail/tss.cpp index 881446ba4306..f00bf219e38f 100644 --- a/src/util/coroutine/detail/tss.cpp +++ b/src/util/coroutine/detail/tss.cpp @@ -8,7 +8,7 @@ // (C) Copyright 2008 Anthony Williams // (C) Copyright 2011-2012 Vicente J. Botet Escriba -#include +#include #include #include #include diff --git a/src/util/generate_unique_ids.cpp b/src/util/generate_unique_ids.cpp index c70cf81f4e30..d9ce2d757a3f 100644 --- a/src/util/generate_unique_ids.cpp +++ b/src/util/generate_unique_ids.cpp @@ -5,17 +5,9 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) #include -#include -#include #include -#include #include -#include #include -#include - -#include -#include namespace hpx { namespace util { diff --git a/src/util/init_ini_data.cpp b/src/util/init_ini_data.cpp index 2a808f6c5e13..792867163735 100644 --- a/src/util/init_ini_data.cpp +++ b/src/util/init_ini_data.cpp @@ -4,7 +4,6 @@ // 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) -#include #include #include #include diff --git a/src/util/integer/int128.cpp b/src/util/integer/int128.cpp index 9ac030fbefe2..c118dc5d6f75 100644 --- a/src/util/integer/int128.cpp +++ b/src/util/integer/int128.cpp @@ -6,11 +6,11 @@ // 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) -#include #include -#include #include +#include +#include #include // IMPLEMENTATION @@ -22,7 +22,7 @@ namespace hpx { namespace util { namespace integer if (radix < 2 || radix > 37) return "(invalid radix)"; static char sz [256]; - memset (sz, 0, 256); + std::memset (sz, 0, 256); int128 r; int128 ii = (*this < 0) ? -*this : *this; diff --git a/src/util/integer/uint128.cpp b/src/util/integer/uint128.cpp index 11a5cc8c1683..f5d286c818af 100644 --- a/src/util/integer/uint128.cpp +++ b/src/util/integer/uint128.cpp @@ -6,11 +6,11 @@ // 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) -#include #include -#include #include +#include +#include #include // IMPLEMENTATION @@ -22,7 +22,7 @@ namespace hpx { namespace util { namespace integer if (radix < 2 || radix > 37) return "(invalid radix)"; static char sz [256]; - memset (sz, 0, 256); + std::memset (sz, 0, 256); uint128 r; uint128 ii = *this; diff --git a/src/util/io_service_pool.cpp b/src/util/io_service_pool.cpp index c0999095c72f..1b49098c5112 100644 --- a/src/util/io_service_pool.cpp +++ b/src/util/io_service_pool.cpp @@ -7,8 +7,7 @@ // 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) -#include - +#include #include #include diff --git a/src/util/itt_notify.cpp b/src/util/itt_notify.cpp index b2e9de18c062..02afafd122ba 100644 --- a/src/util/itt_notify.cpp +++ b/src/util/itt_notify.cpp @@ -3,7 +3,6 @@ // 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) -#include #include #if HPX_HAVE_ITTNOTIFY != 0 diff --git a/src/util/logging.cpp b/src/util/logging.cpp index 424b0ad79164..cca04112781e 100644 --- a/src/util/logging.cpp +++ b/src/util/logging.cpp @@ -4,7 +4,7 @@ // 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) -#include +#include #if defined(HPX_HAVE_LOGGING) diff --git a/src/util/manage_config.cpp b/src/util/manage_config.cpp index b8a992b5e6df..71005d5b37b5 100644 --- a/src/util/manage_config.cpp +++ b/src/util/manage_config.cpp @@ -3,7 +3,6 @@ // 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) -#include #include namespace hpx { namespace util diff --git a/src/util/map_hostnames.cpp b/src/util/map_hostnames.cpp index b37aae6cb4a6..25bec18fd2db 100644 --- a/src/util/map_hostnames.cpp +++ b/src/util/map_hostnames.cpp @@ -3,14 +3,16 @@ // 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) -#include #include +#include #include #include -#include +#include #include -#include + +#include +#include namespace hpx { namespace util { diff --git a/src/util/parse_command_line.cpp b/src/util/parse_command_line.cpp index 99a14bfed250..11d15a374b62 100644 --- a/src/util/parse_command_line.cpp +++ b/src/util/parse_command_line.cpp @@ -3,7 +3,6 @@ // 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) -#include #include #include #include diff --git a/src/util/register_locks.cpp b/src/util/register_locks.cpp index 87ff84a209d3..6663cb2697be 100644 --- a/src/util/register_locks.cpp +++ b/src/util/register_locks.cpp @@ -4,14 +4,14 @@ // 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) -#include +#include #include +#include #include #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////////// diff --git a/src/util/register_locks_globally.cpp b/src/util/register_locks_globally.cpp index b40fe72953f7..ae364fa039da 100644 --- a/src/util/register_locks_globally.cpp +++ b/src/util/register_locks_globally.cpp @@ -3,7 +3,6 @@ // 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) -#include #include #include #include diff --git a/src/util/runtime_configuration.cpp b/src/util/runtime_configuration.cpp index bffefa664f10..825186a1fb86 100644 --- a/src/util/runtime_configuration.cpp +++ b/src/util/runtime_configuration.cpp @@ -6,7 +6,6 @@ #include #include -#include #include #include #include diff --git a/src/util/security/root_certificate_authority.cpp b/src/util/security/root_certificate_authority.cpp index d09422b62041..4b3e496cc291 100644 --- a/src/util/security/root_certificate_authority.cpp +++ b/src/util/security/root_certificate_authority.cpp @@ -4,7 +4,7 @@ // 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) -#include +#include #if defined(HPX_HAVE_SODIUM) diff --git a/src/util/security/subordinate_certificate_authority.cpp b/src/util/security/subordinate_certificate_authority.cpp index 2b4a9984f840..f72426882b15 100644 --- a/src/util/security/subordinate_certificate_authority.cpp +++ b/src/util/security/subordinate_certificate_authority.cpp @@ -4,7 +4,7 @@ // 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) -#include +#include #if defined(HPX_HAVE_SODIUM) diff --git a/src/util/sed_transform.cpp b/src/util/sed_transform.cpp index 6a40ccc5e871..a2b312bb4814 100644 --- a/src/util/sed_transform.cpp +++ b/src/util/sed_transform.cpp @@ -5,7 +5,6 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) //////////////////////////////////////////////////////////////////////////////// -#include #include #include #include diff --git a/src/util/serialize_exception.cpp b/src/util/serialize_exception.cpp index 9510620a0b53..6b1c6cd3a536 100644 --- a/src/util/serialize_exception.cpp +++ b/src/util/serialize_exception.cpp @@ -3,7 +3,6 @@ // 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) -#include #include #include #include diff --git a/src/util/static_reinit.cpp b/src/util/static_reinit.cpp index e07e5604723a..3d27d88df617 100644 --- a/src/util/static_reinit.cpp +++ b/src/util/static_reinit.cpp @@ -3,7 +3,6 @@ // 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) -#include #include #include #include diff --git a/src/util/thread_mapper.cpp b/src/util/thread_mapper.cpp index 99698c18d291..2c2c608c4be7 100644 --- a/src/util/thread_mapper.cpp +++ b/src/util/thread_mapper.cpp @@ -3,7 +3,6 @@ // 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) -#include #include #include