Adapting HPX modules of levels 19, 20, 21, and 22 to C++ modules

Signed-off-by: Hartmut Kaiser <hartmut.kaiser@gmail.com>

Author: hkaiser

components/component_storage/include/hpx/components/component_storage/component_storage.hpp

@@ -8,7 +8,7 @@
 
 #include <hpx/config.hpp>
 #include <hpx/components/client_base.hpp>
-#include <hpx/futures/future.hpp>
+#include <hpx/modules/futures.hpp>
 #include <hpx/modules/async_base.hpp>
 #include <hpx/naming_base/address.hpp>
 #include <hpx/naming_base/id_type.hpp>
@@ -18,6 +18,8 @@
 #include <cstddef>
 #include <vector>
 
+#include <hpx/config/warnings_prefix.hpp>
+
 namespace hpx { namespace components {
     ///////////////////////////////////////////////////////////////////////////
     class HPX_MIGRATE_TO_STORAGE_EXPORT component_storage
@@ -45,3 +47,5 @@ namespace hpx { namespace components {
         std::size_t size(launch::sync_policy) const;
     };
 }}    // namespace hpx::components
+
+#include <hpx/config/warnings_suffix.hpp>

components/component_storage/include/hpx/components/component_storage/migrate_from_storage.hpp

@@ -10,7 +10,7 @@
 
 #include <hpx/config.hpp>
 #include <hpx/components_base/traits/is_component.hpp>
-#include <hpx/futures/future.hpp>
+#include <hpx/modules/futures.hpp>
 #include <hpx/naming_base/id_type.hpp>
 
 #include <hpx/components/component_storage/server/migrate_from_storage.hpp>

components/component_storage/include/hpx/components/component_storage/migrate_to_storage.hpp

@@ -11,7 +11,7 @@
 #include <hpx/config.hpp>
 #include <hpx/components/client_base.hpp>
 #include <hpx/components_base/traits/is_component.hpp>
-#include <hpx/futures/future.hpp>
+#include <hpx/modules/futures.hpp>
 #include <hpx/naming_base/id_type.hpp>
 
 #include <hpx/components/component_storage/component_storage.hpp>

components/component_storage/include/hpx/components/component_storage/server/component_storage.hpp

@@ -11,17 +11,18 @@
 #include <hpx/actions_base/basic_action.hpp>
 #include <hpx/actions_base/component_action.hpp>
 #include <hpx/async_distributed/transfer_continuation_action.hpp>
+#include <hpx/modules/synchronization.hpp>
 #include <hpx/naming_base/address.hpp>
 #include <hpx/naming_base/id_type.hpp>
-#include <hpx/synchronization/spinlock.hpp>
-
-#include <hpx/components/containers/unordered/unordered_map.hpp>
 
 #include <hpx/components/component_storage/export_definitions.hpp>
+#include <hpx/components/containers/unordered/unordered_map.hpp>
 
 #include <cstddef>
 #include <vector>
 
+#include <hpx/config/warnings_prefix.hpp>
+
 ///////////////////////////////////////////////////////////////////////////////
 namespace hpx::components::server {
 
@@ -51,6 +52,8 @@ namespace hpx::components::server {
     };
 }    // namespace hpx::components::server
 
+#include <hpx/config/warnings_suffix.hpp>
+
 HPX_REGISTER_ACTION_DECLARATION(
     hpx::components::server::component_storage::migrate_to_here_action,
     component_storage_migrate_component_to_here_action)

components/containers/partitioned_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_decl.hpp

@@ -12,11 +12,11 @@
 #include <hpx/config.hpp>
 #include <hpx/actions_base/traits/is_distribution_policy.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/async_combinators/when_all.hpp>
 #include <hpx/components/client_base.hpp>
 #include <hpx/distribution_policies/container_distribution_policy.hpp>
 #include <hpx/distribution_policies/explicit_container_distribution_policy.hpp>
 #include <hpx/modules/async_base.hpp>
+#include <hpx/modules/async_combinators.hpp>
 #include <hpx/modules/functional.hpp>
 #include <hpx/modules/type_support.hpp>
 #include <hpx/runtime_components/distributed_metadata_base.hpp>

components/containers/partitioned_vector/include/hpx/components/containers/partitioned_vector/partitioned_vector_impl.hpp

@@ -10,11 +10,11 @@
 #include <hpx/config.hpp>
 #include <hpx/actions_base/traits/is_distribution_policy.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/async_combinators/wait_all.hpp>
 #include <hpx/components/get_ptr.hpp>
 #include <hpx/distribution_policies/container_distribution_policy.hpp>
 #include <hpx/distribution_policies/explicit_container_distribution_policy.hpp>
 #include <hpx/modules/async_base.hpp>
+#include <hpx/modules/async_combinators.hpp>
 #include <hpx/modules/async_distributed.hpp>
 #include <hpx/modules/errors.hpp>
 #include <hpx/modules/execution.hpp>

components/containers/partitioned_vector/src/partitioned_vector_component_double.cpp

@@ -25,6 +25,8 @@ HPX_REGISTER_PARTITIONED_VECTOR(double)
 #pragma warning(disable : 5037)
 #endif
 
+#include <hpx/config/warnings_prefix.hpp>
+
 template class HPX_PARTITIONED_VECTOR_EXPORT
     hpx::server::partitioned_vector<double, std::vector<double>>;
 template class HPX_PARTITIONED_VECTOR_EXPORT

components/containers/partitioned_vector/src/partitioned_vector_component_int.cpp

@@ -27,6 +27,8 @@ HPX_REGISTER_PARTITIONED_VECTOR(long_long)
 #pragma warning(disable : 5037)
 #endif
 
+#include <hpx/config/warnings_prefix.hpp>
+
 template class HPX_PARTITIONED_VECTOR_EXPORT
     hpx::server::partitioned_vector<int, std::vector<int>>;
 template class HPX_PARTITIONED_VECTOR_EXPORT

components/containers/partitioned_vector/src/partitioned_vector_component_std_string.cpp

@@ -28,6 +28,8 @@ HPX_REGISTER_PARTITIONED_VECTOR(std_string)
 #pragma warning(disable : 5037)
 #endif
 
+#include <hpx/config/warnings_prefix.hpp>
+
 template class HPX_PARTITIONED_VECTOR_EXPORT
     hpx::server::partitioned_vector<std::string, std::vector<std::string>>;
 template class HPX_PARTITIONED_VECTOR_EXPORT

components/containers/unordered/include/hpx/components/containers/unordered/unordered_map.hpp

@@ -11,11 +11,11 @@
 #include <hpx/config.hpp>
 #include <hpx/actions_base/traits/is_distribution_policy.hpp>
 #include <hpx/assert.hpp>
-#include <hpx/async_combinators/wait_all.hpp>
 #include <hpx/components/client_base.hpp>
 #include <hpx/components/get_ptr.hpp>
 #include <hpx/components_base/component_type.hpp>
 #include <hpx/distribution_policies/container_distribution_policy.hpp>
+#include <hpx/modules/async_combinators.hpp>
 #include <hpx/modules/functional.hpp>
 #include <hpx/modules/serialization.hpp>
 #include <hpx/modules/type_support.hpp>