#880: change Holder::foreach() to return void

DARMA-tasking · Aug 18, 2020 · 27e83cd · 27e83cd
1 parent 3dfddb2
commit 27e83cd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/vt/vrt/collection/holders/col_holder.h b/src/vt/vrt/collection/holders/col_holder.h
@@ -93,7 +93,7 @@ struct CollectionHolder : BaseHolder {
   bool is_static_ = false;                    /**< Whether is static sized */
   HandlerType map_fn = uninitialized_handler; /**< The map function */
   IndexT max_idx;                             /**< Index range for collection */
-  Holder<ColT,IndexT> holder_;                /**< Inner holder of elements */
+  Holder<ColT, IndexT> holder_;               /**< Inner holder of elements */
 };
 
 }}} /* end namespace vt::vrt::collection */

diff --git a/src/vt/vrt/collection/holders/holder.h b/src/vt/vrt/collection/holders/holder.h
@@ -151,10 +151,8 @@ struct Holder {
    * \brief Perform apply action over all collection elements
    *
    * \param[in] fn apply function for each element
-   *
-   * \return whether it succeeded (always true)
    */
-  bool foreach(FuncApplyType fn);
+  void foreach(FuncApplyType fn);
 
   /**
    * \brief Count number of elements

diff --git a/src/vt/vrt/collection/holders/holder.impl.h b/src/vt/vrt/collection/holders/holder.impl.h
@@ -152,7 +152,7 @@ void Holder<ColT, IndexT>::cleanupExists() {
 }
 
 template <typename ColT, typename IndexT>
-bool Holder<ColT, IndexT>::foreach(FuncApplyType fn) {
+void Holder<ColT, IndexT>::foreach(FuncApplyType fn) {
   static uint64_t num_reentrant = 0;
 
   num_reentrant++;
@@ -162,15 +162,14 @@ bool Holder<ColT, IndexT>::foreach(FuncApplyType fn) {
       auto const& idx = elm.first;
       auto const& holder = elm.second;
       auto const col_ptr = holder.getCollection();
-      fn(idx,col_ptr);
+      fn(idx, col_ptr);
     }
   }
   num_reentrant--;
 
   if (num_reentrant == 0) {
     cleanupExists();
   }
-  return true;
 }
 
 template <typename ColT, typename IndexT>