Some other changes

STEllAR-GROUP · Jul 10, 2017 · bbde6b3 · bbde6b3
1 parent 0cb8f8a
commit bbde6b3
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 29 deletions.
diff --git a/hpx/components/containers/coarray/coarray.hpp b/hpx/components/containers/coarray/coarray.hpp
@@ -60,6 +60,9 @@ namespace hpx
             using iterator =
                 typename std::array<std::size_t,N>::iterator;
 
+            using const_iterator =
+                typename std::array<std::size_t,N>::const_iterator;
+
             template<typename ... I>
             coarray_sizes(I... i)
             : sizes_({{i...}})
@@ -95,19 +98,14 @@ namespace hpx
                 return sizes_.end();
             }
 
-            template<typename View, typename Iterator, std::size_t ... I>
-            void update_view(
-                View & v,
-                std::size_t num_images,
-                hpx::util::detail::pack_c<std::size_t, I...>,
-                hpx::lcos::spmd_block const & block,
-                Iterator && begin,
-                Iterator && last) const
+            const_iterator begin() const
+            {
+                return sizes_.cbegin();
+            }
+
+            const_iterator end() const
             {
-                v = View(block,
-                    std::forward<Iterator>(begin),
-                    std::forward<Iterator>(last),
-                    {(sizes_[I]!= std::size_t(-1) ? sizes_[I] : num_images)...});
+                return sizes_.cend();
             }
 
         private:
@@ -136,11 +134,11 @@ namespace hpx
             std::size_t num_segments,
             std::size_t unroll)
         {
-        using iterator = typename
-                std::vector<hpx::naming::id_type>::iterator;
+            using iterator = typename
+                    std::vector<hpx::naming::id_type>::iterator;
 
-        using const_iterator = typename
-                std::vector<hpx::naming::id_type>::const_iterator;
+            using const_iterator = typename
+                    std::vector<hpx::naming::id_type>::const_iterator;
 
             std::vector<hpx::naming::id_type> out(num_segments);
 
@@ -158,6 +156,23 @@ namespace hpx
            return out;
        }
 
+        template<typename Iterator, std::size_t ... I>
+        base_type update_view(
+            hpx::detail::coarray_sizes<N> const & cosizes,
+            std::size_t num_images,
+            hpx::util::detail::pack_c<std::size_t, I...>,
+            hpx::lcos::spmd_block const & block,
+            Iterator && begin,
+            Iterator && last) const
+        {
+            return base_type(
+                block,
+                std::forward<Iterator>(begin),
+                std::forward<Iterator>(last),
+                {(cosizes.begin()[I]!= std::size_t(-1)
+                    ? cosizes.begin()[I] : num_images)...});
+        }
+
     public:
         explicit coarray(
             hpx::lcos::spmd_block const & block,
@@ -175,7 +190,7 @@ namespace hpx
             {
                 std::size_t num_segments = N > 0 ? 1 : 0;
 
-                for(std::size_t i : cosizes)
+                for(std::size_t const & i : cosizes)
                 {
                     num_segments *= (i != std::size_t(-1) ? i : num_images);
                 }
@@ -198,9 +213,8 @@ namespace hpx
             else
                 vector_.connect_to(hpx::launch::sync, name + "_hpx_coarray");
 
-            cosizes.update_view(
-                view, num_images, indices(),
-                    block, vector_.begin(), vector_.end());
+            view = update_view(cosizes,
+                num_images, indices(), block, vector_.begin(), vector_.end());
         }
 
         template<typename... I,

diff --git a/hpx/components/containers/partitioned_vector/detail/view_element.hpp b/hpx/components/containers/partitioned_vector/detail/view_element.hpp
@@ -109,7 +109,7 @@ namespace hpx { namespace detail
 
         // Note: Put operation. Race condition may occur, be sure that
         // operator=() is called by only one thread at a time.
-        view_element && operator=(Data && other)
+        void operator=(Data && other)
         {
             if ( is_data_here() )
             {
@@ -124,13 +124,11 @@ namespace hpx { namespace detail
             {
                 this->set_data(hpx::launch::sync, std::move(other) );
             }
-
-            return std::move(*this);
         }
 
         // Note: Put operation. Race condition may occur, be sure that
         // operator=() is called by only one thread at a time.
-        view_element && operator=(Data const & other)
+        void operator=(Data const & other)
         {
             if ( is_data_here() )
             {
@@ -145,12 +143,10 @@ namespace hpx { namespace detail
             {
                 this->set_data(hpx::launch::sync, Data(other) );
             }
-
-            return std::move(*this);
         }
 
         // Note: Put operation. Free of race conditions.
-        view_element && operator=(view_element<T,Data> && other)
+        void operator=(view_element<T,Data> && other)
         {
             if(other.is_owned_by_current_thread())
             {
@@ -168,8 +164,6 @@ namespace hpx { namespace detail
                 else
                     this->set_data(hpx::launch::sync, other.const_data() );
             }
-
-            return std::move(*this);
         }
 
         T operator[](std::size_t i) const