Merge pull request #2755 from STEllAR-GROUP/remove_make_index_pack_un…

…rolled Removing make_index_pack_unrolled
STEllAR-GROUP · Jul 15, 2017 · cd00c78 · cd00c78
2 parents df7616b + c960e41
commit cd00c78
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 94 deletions.
diff --git a/hpx/components/containers/partitioned_vector/partitioned_vector_view.hpp b/hpx/components/containers/partitioned_vector/partitioned_vector_view.hpp
@@ -77,8 +77,7 @@ namespace hpx
             list_type hw_sizes = {})
         : begin_( begin ), end_( begin ), block_( block )
         {
-            using indices =
-                typename hpx::util::detail::make_index_pack_unroll<N>::type;
+            using indices = typename hpx::util::detail::make_index_pack<N>::type;
 
             // Physical sizes is equal to logical sizes if physical sizes are
             // not defined

diff --git a/hpx/components/containers/partitioned_vector/partitioned_vector_view_iterator.hpp b/hpx/components/containers/partitioned_vector/partitioned_vector_view_iterator.hpp
@@ -32,8 +32,7 @@ namespace hpx {
     private:
         using pvector_iterator = hpx::vector_iterator<T,Data>;
         using segment_iterator = typename pvector_iterator::segment_iterator;
-        using indices =
-            typename hpx::util::detail::make_index_pack_unroll<N>::type;
+        using indices = typename hpx::util::detail::make_index_pack<N>::type;
 
     template<std::size_t... I>
     std::size_t  increment_solver( std::size_t dist,

diff --git a/hpx/util/detail/pack.hpp b/hpx/util/detail/pack.hpp
@@ -155,96 +155,6 @@ namespace hpx { namespace util { namespace detail
     struct at_index
       : at_index_impl<I, pack<Ts...> >::type
     {};
-    ////////////////////////////////////////////////////////////////////////////
-    template< std::size_t N,
-        std::size_t Start = 0,
-        typename previous_sequence = pack_c<std::size_t>,
-        bool = (N > 8)>
-    struct make_index_pack_unroll;
-
-    template<std::size_t Start, std::size_t... I>
-    struct make_index_pack_unroll<0, Start,
-        pack_c<std::size_t, I...>, false>
-    {
-        using type = pack_c<std::size_t, I...>;
-    };
-
-    template<std::size_t Start, std::size_t... I>
-    struct make_index_pack_unroll<1, Start,
-        pack_c<std::size_t, I...>, false>
-    {
-        using type = pack_c<std::size_t, I..., Start>;
-    };
-
-    template<std::size_t Start, std::size_t... I>
-    struct make_index_pack_unroll<2, Start,
-        pack_c<std::size_t, I...>, false>
-    {
-        using type = pack_c<std::size_t, I..., Start, Start+1>;
-    };
-
-    template<std::size_t Start, std::size_t... I>
-    struct make_index_pack_unroll<3, Start,
-        pack_c<std::size_t, I...>, false>
-    {
-        using type
-            = pack_c<std::size_t, I..., Start, Start+1, Start+2>;
-    };
-
-    template<std::size_t Start, std::size_t... I>
-    struct make_index_pack_unroll<4, Start,
-        pack_c<std::size_t, I...>, false>
-    {
-        using type
-            = pack_c<std::size_t, I..., Start, Start+1, Start+2,
-                Start+3>;
-    };
-
-    template<std::size_t Start, std::size_t... I>
-    struct make_index_pack_unroll<5, Start,
-        pack_c<std::size_t, I...>, false>
-    {
-        using type
-            = pack_c<std::size_t, I..., Start, Start+1, Start+2,
-                Start+3, Start+4>;
-    };
-
-    template<std::size_t Start, std::size_t... I>
-    struct make_index_pack_unroll<6, Start,
-        pack_c<std::size_t, I...>, false>
-    {
-        using type
-            = pack_c<std::size_t, I..., Start, Start+1, Start+2,
-                Start+3, Start+4, Start+5>;
-    };
-
-    template<std::size_t Start, std::size_t... I>
-    struct make_index_pack_unroll<7, Start,
-        pack_c<std::size_t, I...>, false>
-    {
-        using type
-            = pack_c<std::size_t, I..., Start, Start+1, Start+2,
-                Start+3, Start+4, Start+5, Start+6>;
-    };
-
-    template<std::size_t Start, std::size_t... I>
-    struct make_index_pack_unroll<8, Start,
-        pack_c<std::size_t, I...>, false>
-    {
-        using type
-            = pack_c<std::size_t, I..., Start, Start+1,Start+2,
-                Start+3, Start+4, Start+5, Start+6, Start+7>;
-    };
-
-    template<std::size_t Start, std::size_t N, std::size_t... I>
-    struct make_index_pack_unroll<N, Start,
-        pack_c<std::size_t, I...>, true>
-    {
-        using type
-            = typename make_index_pack_unroll<N-8, Start+8,
-                pack_c<std::size_t, I..., Start, Start+1, Start+2,
-                    Start+3, Start+4, Start+5, Start+6, Start+7>>::type;
-    };
 }}}
 
 #endif