Silencing MSVC warnings

- flyby: re-activate accidentally commented test
STEllAR-GROUP · Sep 15, 2017 · 2945dcd · 2945dcd
1 parent c50c064
commit 2945dcd
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 28 deletions.
diff --git a/hpx/components/containers/partitioned_vector/partitioned_vector_decl.hpp b/hpx/components/containers/partitioned_vector/partitioned_vector_decl.hpp
@@ -397,11 +397,11 @@ namespace hpx
         /// \param symbolic_name    The (optional) name to register the newly
         ///                         created vector
         ///
-        template <typename DistPolicy>
-        partitioned_vector(size_type size, DistPolicy const& policy,
-                typename std::enable_if<
-                    traits::is_distribution_policy<DistPolicy>::value
-                >::type* = nullptr);
+        template <typename DistPolicy,
+            typename U = typename std::enable_if<
+                traits::is_distribution_policy<DistPolicy>::value
+            >::type>
+        partitioned_vector(size_type size, DistPolicy const& policy);
 
         /// Constructor which create and initialize vector with the
         /// given \a where all elements are initialized with \a val and
@@ -413,12 +413,11 @@ namespace hpx
         /// \param symbolic_name    The (optional) name to register the newly
         ///                         created vector
         ///
-        template <typename DistPolicy>
-        partitioned_vector(size_type size, T const& val,
-            DistPolicy const& policy,
-            typename std::enable_if<
+        template <typename DistPolicy,
+            typename U = typename std::enable_if<
                 traits::is_distribution_policy<DistPolicy>::value
-            >::type* = nullptr);
+            >::type>
+        partitioned_vector(size_type size, T const& val, DistPolicy const& policy);
 
         /// Copy construction performs a deep copy of the right hand side
         /// vector.

diff --git a/hpx/components/containers/partitioned_vector/partitioned_vector_impl.hpp b/hpx/components/containers/partitioned_vector/partitioned_vector_impl.hpp
@@ -512,12 +512,10 @@ namespace hpx
     }
 
     template <typename T, typename Data /*= std::vector<T> */>
-    template <typename DistPolicy>
+    template <typename DistPolicy, typename U>
     HPX_PARTITIONED_VECTOR_SPECIALIZATION_EXPORT
     partitioned_vector<T, Data>::partitioned_vector(size_type size,
-        DistPolicy const& policy,
-        typename std::enable_if<
-            traits::is_distribution_policy<DistPolicy>::value>::type*)
+            DistPolicy const& policy)
       : size_(size)
       , partition_size_(std::size_t(-1))
     {
@@ -526,12 +524,10 @@ namespace hpx
     }
 
     template <typename T, typename Data /*= std::vector<T> */>
-    template <typename DistPolicy>
+    template <typename DistPolicy, typename U>
     HPX_PARTITIONED_VECTOR_SPECIALIZATION_EXPORT
     partitioned_vector<T, Data>::partitioned_vector(size_type size, T const& val,
-        DistPolicy const& policy,
-        typename std::enable_if<
-            traits::is_distribution_policy<DistPolicy>::value>::type* /*= nullptr*/)
+            DistPolicy const& policy)
       : size_(size)
       , partition_size_(std::size_t(-1))
     {

diff --git a/src/components/containers/partitioned_vector/partitioned_vector_component_double.cpp b/src/components/containers/partitioned_vector/partitioned_vector_component_double.cpp
@@ -22,9 +22,8 @@ template class HPX_PARTITIONED_VECTOR_EXPORT
     hpx::partitioned_vector<double, std::vector<double>>;
 template HPX_PARTITIONED_VECTOR_EXPORT
     hpx::partitioned_vector<double, std::vector<double>>::partitioned_vector(
-        size_type, hpx::container_distribution_policy const&, void*);
+        size_type, hpx::container_distribution_policy const&);
 template HPX_PARTITIONED_VECTOR_EXPORT
     hpx::partitioned_vector<double, std::vector<double>>::partitioned_vector(
-        size_type, double const&, hpx::container_distribution_policy const&,
-        void*);
+        size_type, double const&, hpx::container_distribution_policy const&);
 
diff --git a/src/components/containers/partitioned_vector/partitioned_vector_component_int.cpp b/src/components/containers/partitioned_vector/partitioned_vector_component_int.cpp
@@ -22,9 +22,8 @@ template class HPX_PARTITIONED_VECTOR_EXPORT
     hpx::partitioned_vector<int, std::vector<int>>;
 template HPX_PARTITIONED_VECTOR_EXPORT
     hpx::partitioned_vector<int, std::vector<int>>::partitioned_vector(
-        size_type, hpx::container_distribution_policy const&, void*);
+        size_type, hpx::container_distribution_policy const&);
 template HPX_PARTITIONED_VECTOR_EXPORT
     hpx::partitioned_vector<int, std::vector<int>>::partitioned_vector(
-        size_type, int const&, hpx::container_distribution_policy const&,
-        void*);
+        size_type, int const&, hpx::container_distribution_policy const&);
 
diff --git a/src/components/containers/partitioned_vector/partitioned_vector_component_std_string.cpp b/src/components/containers/partitioned_vector/partitioned_vector_component_std_string.cpp
@@ -25,9 +25,8 @@ template class HPX_PARTITIONED_VECTOR_EXPORT
     hpx::partitioned_vector<std::string, std::vector<std::string>>;
 template HPX_PARTITIONED_VECTOR_EXPORT
     hpx::partitioned_vector<std::string, std::vector<std::string>>::
-        partitioned_vector(size_type, hpx::container_distribution_policy const&,
-            void*);
+        partitioned_vector(size_type, hpx::container_distribution_policy const&);
 template HPX_PARTITIONED_VECTOR_EXPORT
     hpx::partitioned_vector<std::string, std::vector<std::string>>::
         partitioned_vector(size_type, std::string const&,
-        hpx::container_distribution_policy const&, void*);
+            hpx::container_distribution_policy const&);
diff --git a/tests/unit/parallel/segmented_algorithms/partitioned_vector_target.cpp b/tests/unit/parallel/segmented_algorithms/partitioned_vector_target.cpp
@@ -70,7 +70,7 @@ void allocation_tests()
 int main()
 {
     allocation_tests<double>();
-//     allocation_tests<int>();
+    allocation_tests<int>();
 
     return 0;
 }