Adding inspect checks for HPX macros/related includes

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 <hpx/include/components.hpp>
 #include <hpx/include/actions.hpp>
 
+#include <hpx/util/detail/pp/cat.hpp>
+
 ///////////////////////////////////////////////////////////////////////////////
 namespace examples { namespace server
 {

hpx/components/containers/partitioned_vector/partitioned_vector_component.hpp

@@ -25,6 +25,7 @@
 #include <hpx/runtime/launch_policy.hpp>
 #include <hpx/util/assert.hpp>
 #include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
 #include <hpx/util/detail/pp/nargs.hpp>
 
 #include <hpx/components/containers/partitioned_vector/partitioned_vector_fwd.hpp>

hpx/components/containers/unordered/partition_unordered_map_component.hpp

@@ -30,6 +30,8 @@
 #include <hpx/throw_exception.hpp>
 #include <hpx/util/assert.hpp>
 #include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
+#include <hpx/util/detail/pp/nargs.hpp>
 
 #include <cstddef>
 #include <iostream>

hpx/config/boost/compiler/intel.hpp

@@ -12,6 +12,8 @@
 
 //  See http://www.boost.org for most recent version.
 
+// noinspect:noinclude:BOOST_STRINGIZE
+
 // make sure header testing does not throw errors
 #if defined(__INTEL_COMPILER)
 

hpx/include/util.hpp

@@ -14,7 +14,9 @@
 #include <hpx/util/bind.hpp>
 #include <hpx/util/decay.hpp>
 #include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
 #include <hpx/util/detail/pp/nargs.hpp>
+#include <hpx/util/detail/pp/stringize.hpp>
 #include <hpx/util/detail/pp/strip_parens.hpp>
 #include <hpx/util/function.hpp>
 #include <hpx/util/get_and_reset_value.hpp>

hpx/lcos/base_lco_with_value.hpp

@@ -15,6 +15,7 @@
 #include <hpx/runtime/components/server/managed_component_base.hpp>
 #include <hpx/runtime/components_fwd.hpp>
 #include <hpx/runtime/naming/id_type.hpp>
+#include <hpx/util/detail/pp/cat.hpp>
 #include <hpx/util/ini.hpp>
 #include <hpx/util/unused.hpp>
 #include <hpx/util/void_guard.hpp>

hpx/lcos/broadcast.hpp

@@ -147,6 +147,7 @@ namespace hpx { namespace lcos
 #include <hpx/traits/promise_local_result.hpp>
 #include <hpx/util/calculate_fanout.hpp>
 #include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
 #include <hpx/util/detail/pp/nargs.hpp>
 #include <hpx/util/detail/pack.hpp>
 #include <hpx/util/tuple.hpp>

hpx/lcos/fold.hpp

@@ -177,6 +177,7 @@ namespace hpx { namespace lcos
 #include <hpx/util/assert.hpp>
 #include <hpx/util/decay.hpp>
 #include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
 #include <hpx/util/detail/pp/nargs.hpp>
 #include <hpx/util/detail/pack.hpp>
 #include <hpx/util/tuple.hpp>

hpx/lcos/gather.hpp

@@ -205,6 +205,7 @@ namespace hpx { namespace lcos
 #include <hpx/runtime/naming/unmanaged.hpp>
 #include <hpx/util/decay.hpp>
 #include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
 #include <hpx/util/detail/pp/nargs.hpp>
 #include <hpx/util/unused.hpp>
 

hpx/lcos/reduce.hpp

@@ -90,6 +90,7 @@ namespace hpx { namespace lcos
 #include <hpx/util/calculate_fanout.hpp>
 #include <hpx/util/decay.hpp>
 #include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
 #include <hpx/util/detail/pp/nargs.hpp>
 #include <hpx/util/detail/pack.hpp>
 #include <hpx/util/tuple.hpp>

hpx/lcos/server/channel.hpp

@@ -14,6 +14,10 @@
 #include <hpx/runtime/components/server/managed_component_base.hpp>
 #include <hpx/traits/get_remote_result.hpp>
 #include <hpx/traits/promise_remote_result.hpp>
+#include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
+#include <hpx/util/detail/pp/nargs.hpp>
+#include <hpx/util/detail/pp/stringize.hpp>
 
 #include <cstddef>
 #include <exception>

hpx/lcos/server/queue.hpp

@@ -18,7 +18,10 @@
 #include <hpx/runtime/components/server/component_base.hpp>
 #include <hpx/runtime/threads/thread_helpers.hpp>
 #include <hpx/traits/get_remote_result.hpp>
+#include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
 #include <hpx/util/detail/pp/nargs.hpp>
+#include <hpx/util/detail/pp/stringize.hpp>
 
 #include <exception>
 #include <memory>

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 <hpx/config.hpp>
 

hpx/plugins/parcel/coalescing_message_handler_registration.hpp

@@ -18,6 +18,9 @@
 #include <hpx/traits/action_message_handler.hpp>
 #include <hpx/util/detail/pp/cat.hpp>
 #include <hpx/util/detail/pp/stringize.hpp>
+#include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
+#include <hpx/util/detail/pp/nargs.hpp>
 
 #include <cstddef>
 

hpx/plugins/plugin_registry.hpp

@@ -13,6 +13,7 @@
 #include <hpx/plugins/unique_plugin_name.hpp>
 
 #include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
 #include <hpx/util/detail/pp/nargs.hpp>
 #include <hpx/util/detail/pp/stringize.hpp>
 #include <hpx/util/find_prefix.hpp>

hpx/runtime/actions/basic_action.hpp

@@ -36,6 +36,7 @@
 #include <hpx/traits/promise_local_result.hpp>
 #include <hpx/util/bind.hpp>
 #include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
 #include <hpx/util/detail/pp/nargs.hpp>
 #include <hpx/util/detail/pp/stringize.hpp>
 #include <hpx/util/detail/pack.hpp>

hpx/runtime/actions/component_action.hpp

@@ -14,6 +14,7 @@
 #include <hpx/runtime/components/console_error_sink.hpp>
 #include <hpx/runtime/naming/address.hpp>
 #include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
 #include <hpx/util/detail/pp/nargs.hpp>
 #include <hpx/util/detail/pp/strip_parens.hpp>
 #include <hpx/util/unused.hpp>

hpx/runtime/actions/detail/action_factory.hpp

@@ -10,6 +10,7 @@
 
 #include <hpx/runtime/actions_fwd.hpp>
 #include <hpx/runtime/actions/action_support.hpp>
+#include <hpx/util/detail/pp/stringize.hpp>
 
 #include <cstdint>
 #include <string>
@@ -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<std::string> get_unassigned_typenames() const;

hpx/runtime/actions/plain_action.hpp

@@ -16,6 +16,7 @@
 #include <hpx/runtime/naming/address.hpp>
 #include <hpx/traits/component_type_database.hpp>
 #include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
 #include <hpx/util/detail/pp/nargs.hpp>
 #include <hpx/util/detail/pack.hpp>
 #include <hpx/util/detail/pp/strip_parens.hpp>

hpx/runtime/actions/transfer_continuation_action.hpp

@@ -38,7 +38,8 @@ namespace hpx { namespace actions
         typedef transfer_base_action<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 <std::size_t ...Is>
         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;
 

hpx/runtime/actions/trigger.hpp

@@ -105,7 +105,8 @@ namespace hpx { namespace actions {
 
         // Overload when return type is "void" aka util::unused_type
         template <typename Result, typename RemoteResult, typename F, typename ...Ts>
-        void trigger_impl(std::true_type, typed_continuation<Result, RemoteResult>&& cont,
+        void trigger_impl(std::true_type,
+            typed_continuation<Result, RemoteResult>&& cont,
             F&& f, Ts&&... vs)
         {
             try {

hpx/runtime/components/component_factory.hpp

@@ -51,6 +51,7 @@
 #include <hpx/throw_exception.hpp>
 #include <hpx/util/atomic_count.hpp>
 #include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
 #include <hpx/util/detail/pp/nargs.hpp>
 #include <hpx/util/ini.hpp>
 #include <hpx/util/unique_function.hpp>

hpx/runtime/components/component_registry.hpp

@@ -14,6 +14,7 @@
 #include <hpx/runtime/components/component_registry_base.hpp>
 #include <hpx/runtime/components/unique_component_name.hpp>
 #include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
 #include <hpx/util/detail/pp/nargs.hpp>
 #include <hpx/util/detail/pp/stringize.hpp>
 #include <hpx/util/find_prefix.hpp>

hpx/runtime/components/component_startup_shutdown.hpp

@@ -8,6 +8,7 @@
 
 #include <hpx/config.hpp>
 #include <hpx/runtime/components/component_startup_shutdown_base.hpp>
+#include <hpx/util/detail/pp/cat.hpp>
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace hpx { namespace components

hpx/runtime/components/derived_component_factory.hpp

@@ -17,6 +17,7 @@
 #include <hpx/throw_exception.hpp>
 #include <hpx/util/atomic_count.hpp>
 #include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
 #include <hpx/util/detail/pp/nargs.hpp>
 #include <hpx/util/detail/pp/stringize.hpp>
 #include <hpx/util/ini.hpp>

hpx/runtime/components/server/distributed_metadata_base.hpp

@@ -12,6 +12,8 @@
 #include <hpx/runtime/actions/component_action.hpp>
 #include <hpx/runtime/components/server/simple_component_base.hpp>
 #include <hpx/runtime/naming/id_type.hpp>
+#include <hpx/util/detail/pp/cat.hpp>
+#include <hpx/util/detail/pp/expand.hpp>
 #include <hpx/util/detail/pp/nargs.hpp>
 
 #include <type_traits>

hpx/runtime/components/static_factory_data.hpp

@@ -12,6 +12,7 @@
 #include <hpx/util/detail/pp/stringize.hpp>
 #include <hpx/util/plugin/export_plugin.hpp>
 #include <hpx/util/plugin/virtual_constructor.hpp>
+#include <hpx/util/detail/pp/cat.hpp>
 
 #include <map>
 #include <string>

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;

hpx/runtime/serialization/detail/polymorphic_nonintrusive_factory.hpp

@@ -15,6 +15,8 @@
 #include <hpx/traits/needs_automatic_registration.hpp>
 #include <hpx/traits/polymorphic_traits.hpp>
 #include <hpx/util/demangle_helper.hpp>
+#include <hpx/util/detail/pp/stringize.hpp>
+#include <hpx/util/detail/pp/strip_parens.hpp>
 #include <hpx/util/jenkins_hash.hpp>
 #include <hpx/util/static.hpp>
 

hpx/runtime/serialization/serialization_chunk.hpp

@@ -38,7 +38,8 @@ namespace hpx { namespace serialization
     {
         chunk_data    data_; // index or pointer
         std::size_t   size_; // size of the serialization_chunk starting index_/pos_
-        std::uint64_t rkey_; // optional RDMA remote key for parcelport put/get operations
+        std::uint64_t rkey_; // optional RDMA remote key for parcelport put/get
+                             // operations
         std::uint8_t  type_; // chunk_type
     };
 

hpx/runtime_impl.hpp

@@ -144,7 +144,8 @@ namespace hpx
         ///                   return immediately. Use a second call to stop
         ///                   with this parameter set to \a true to wait for
         ///                   all internal work to be completed.
-        void stopped(bool blocking, compat::condition_variable& cond, compat::mutex& mtx);
+        void stopped(bool blocking, compat::condition_variable& cond,
+            compat::mutex& mtx);
 
         /// \brief Report a non-recoverable error to the runtime system
         ///

hpx/util/detail/pp/cat.hpp

@@ -1,6 +1,6 @@
 //  Copyright (c) 2017 Hartmut Kaiser
 //
-//  Distributed under the HPX Software License, Version 1.0. (See accompanying
+//  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.HPX.org/LICENSE_1_0.txt)
 
 /* Copyright (C) 2001
@@ -10,6 +10,8 @@
 
 /* Revised by Paul Mensonides (2002) */
 
+// hpxinspect:noinclude:HPX_PP_CAT
+
 #ifndef HPX_UTIL_DETAIL_CAT_HPP_INCLUDED
 #define HPX_UTIL_DETAIL_CAT_HPP_INCLUDED
 
@@ -22,7 +24,8 @@
 #    define HPX_PP_CAT_OO(par) HPX_PP_CAT_I ## par
 # endif
 #
-# if (~HPX_PP_CONFIG_FLAGS() & HPX_PP_CONFIG_MSVC()) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1700)
+# if (~HPX_PP_CONFIG_FLAGS() & HPX_PP_CONFIG_MSVC()) || \
+     (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 1700)
 #    define HPX_PP_CAT_I(a, b) a ## b
 # else
 #    define HPX_PP_CAT_I(a, b) HPX_PP_CAT_II(~, a ## b)