Addressing review comments

STEllAR-GROUP · Aug 22, 2017 · a051f7e · a051f7e
1 parent 0bb901b
commit a051f7e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 17 deletions.
diff --git a/examples/resource_partitioner/shared_priority_scheduler.hpp b/examples/resource_partitioner/shared_priority_scheduler.hpp
@@ -16,6 +16,7 @@
 #include <hpx/runtime/threads/topology.hpp>
 #include <hpx/runtime/threads_fwd.hpp>
 #include <hpx/throw_exception.hpp>
+#include <hpx/util/assert.hpp>
 #include <hpx/util/logging.hpp>
 #include <hpx/util_fwd.hpp>
 
@@ -183,7 +184,7 @@ namespace threads {
                 victim_queues_.clear();
                 victim_queues_.resize(num_worker_queues);
                 //
-                BOOST_ASSERT(num_worker_queues != 0);
+                HPX_ASSERT(num_worker_queues != 0);
                 for (std::size_t i = 0; i < num_worker_queues; ++i)
                     queues_[i] = new thread_queue_type(max_tasks);
 

diff --git a/hpx/util/assert.hpp b/hpx/util/assert.hpp
@@ -7,6 +7,8 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 //  Make HPX inspect tool happy: hpxinspect:noassert_macro
+//                               hpxinspect:nodeprecatedname:BOOST_ASSERT
+
 //  Note: There are no include guards. This is intentional.
 
 #if defined(HPX_USE_BOOST_ASSERT)

diff --git a/plugins/parcelport/verbs/rdma/rdma_chunk_pool.hpp b/plugins/parcelport/verbs/rdma/rdma_chunk_pool.hpp
@@ -16,6 +16,8 @@
 #undef BOOST_POOL_INSTRUMENT
 
 #include <hpx/config.hpp>
+#include <hpx/util/assert.hpp>
+
 //
 #include <plugins/parcelport/verbs/rdma/verbs_memory_region.hpp>
 
@@ -42,8 +44,6 @@
 #include <boost/pool/simple_segregated_storage.hpp>
 // boost::alignment_of
 #include <boost/type_traits/alignment_of.hpp>
-// BOOST_ASSERT
-#include <boost/assert.hpp>
 
 #ifdef BOOST_POOL_INSTRUMENT
 # include <iostream>
@@ -367,8 +367,8 @@ namespace details
             size_type rem = s % min_align;
             if(rem)
                 s += min_align - rem;
-            BOOST_ASSERT(s >= min_alloc_size);
-            BOOST_ASSERT(s % min_align == 0);
+            HPX_ASSERT(s >= min_alloc_size);
+            HPX_ASSERT(s % min_align == 0);
             return s;
         }
 

diff --git a/tests/performance/local/htts_v2/htts2.hpp b/tests/performance/local/htts_v2/htts2.hpp
@@ -6,6 +6,8 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+// hpxinspect:nodeprecatedname:BOOST_ASSERT
+
 #include <hpx/config.hpp>
 
 #include <boost/assert.hpp>

diff --git a/tests/performance/local/nonconcurrent_fifo_overhead.cpp b/tests/performance/local/nonconcurrent_fifo_overhead.cpp
@@ -5,6 +5,8 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ////////////////////////////////////////////////////////////////////////////////
 
+// hpxinspect:nodeprecatedname:BOOST_ASSERT
+
 // Makes HPX use BOOST_ASSERT, so that I can use high_resolution_timer without
 // depending on the rest of HPX.
 #define HPX_USE_BOOST_ASSERT

diff --git a/tests/unit/parallel/segmented_algorithms/partitioned_vector_target.cpp b/tests/unit/parallel/segmented_algorithms/partitioned_vector_target.cpp
@@ -12,18 +12,6 @@
 #include <cstddef>
 #include <vector>
 
- // this file requires serializing threads::mask_type
- #if defined(HPX_HAVE_MORE_THAN_64_THREADS) || (defined(HPX_HAVE_MAX_CPU_COUNT) \
-             && HPX_HAVE_MAX_CPU_COUNT > 64)
- #  if defined(HPX_HAVE_MAX_CPU_COUNT)
- #    include <bitset>
- #    include <hpx/runtime/serialization/bitset.hpp>
- #  else
- #    include <boost/dynamic_bitset.hpp>
- #    include <hpx/runtime/serialization/dynamic_bitset.hpp>
- #  endif
- #endif
-
 ///////////////////////////////////////////////////////////////////////////////
 // Define the vector types to be used.
 typedef hpx::compute::host::block_allocator<int> target_allocator_int;

diff --git a/tools/inspect/deprecated_name_check.cpp b/tools/inspect/deprecated_name_check.cpp
@@ -89,6 +89,7 @@ namespace boost
       { "\\b(BOOST_PP_CAT)\\b", "HPX_PP_CAT" },
       { "\\b(BOOST_PP_STRINGIZE)\\b", "HPX_PP_STRINGIZE" },
       { "\\b(BOOST_STRINGIZE)\\b", "HPX_PP_STRINGIZE(HPX_PP_EXPAND())" },
+      { "\\b(BOOST_ASSERT)\\b", "HPX_ASSERT" },
       { nullptr, nullptr }
     };