Skip to content

Commit

Permalink
Merge pull request #2875 from STEllAR-GROUP/inspect_assert
Browse files Browse the repository at this point in the history
Deprecate use of BOOST_ASSERT
  • Loading branch information
hkaiser committed Sep 9, 2017
2 parents 9b27d35 + 246c3f5 commit ef2e515
Show file tree
Hide file tree
Showing 162 changed files with 326 additions and 149 deletions.
1 change: 1 addition & 0 deletions examples/accumulators/accumulator.hpp
Expand Up @@ -8,6 +8,7 @@
#define HPX_ECFE19F9_A826_4AE1_AC7C_33DC5714CF0B

#include <hpx/include/components.hpp>
#include <hpx/util/assert.hpp>

#include "server/accumulator.hpp"

Expand Down
1 change: 1 addition & 0 deletions examples/accumulators/template_accumulator.hpp
Expand Up @@ -8,6 +8,7 @@
#define HPX_TEMPLATE_ACCUMULATOR_MAR_31_2016_1052AM

#include <hpx/include/components.hpp>
#include <hpx/util/assert.hpp>

#include "server/template_accumulator.hpp"

Expand Down
Expand Up @@ -7,6 +7,7 @@
#define HPX_EXAMPLE_CANCELABLE_ACTION_APR_19_1052AM

#include <hpx/include/components.hpp>
#include <hpx/util/assert.hpp>

#include "stubs/cancelable_action.hpp"

Expand Down
2 changes: 1 addition & 1 deletion examples/cancelable_action/cancelable_action_client.cpp
Expand Up @@ -4,7 +4,7 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

#include <hpx/hpx_init.hpp>
#include <hpx/include/threads.hpp>
#include <hpx/hpx.hpp>

#include "cancelable_action/cancelable_action.hpp"

Expand Down
1 change: 1 addition & 0 deletions examples/jacobi/jacobi_component/row_range.hpp
Expand Up @@ -8,6 +8,7 @@
#define JACOBI_ROW_RANGE_HPP

#include <hpx/util/atomic_count.hpp>
#include <hpx/util/assert.hpp>

#include <boost/intrusive_ptr.hpp>
#include <boost/range/iterator.hpp>
Expand Down
1 change: 1 addition & 0 deletions examples/jacobi/jacobi_component/server/row.hpp
Expand Up @@ -10,6 +10,7 @@
#include "../row_range.hpp"

#include <hpx/include/components.hpp>
#include <hpx/util/assert.hpp>

#include <boost/intrusive_ptr.hpp>
#include <boost/smart_ptr/shared_array.hpp>
Expand Down
1 change: 1 addition & 0 deletions examples/jacobi/jacobi_component/server/solver.hpp
Expand Up @@ -13,6 +13,7 @@

#include <hpx/include/components.hpp>
#include <hpx/lcos/future_wait.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/high_resolution_timer.hpp>

#include <cstddef>
Expand Down
1 change: 1 addition & 0 deletions examples/jacobi/jacobi_component/solver.hpp
Expand Up @@ -11,6 +11,7 @@
#include "grid.hpp"

#include <hpx/include/naming.hpp>
#include <hpx/util/assert.hpp>

#include <cstddef>
#include <utility>
Expand Down
3 changes: 1 addition & 2 deletions examples/quickstart/event_synchronization.cpp
Expand Up @@ -6,8 +6,7 @@
////////////////////////////////////////////////////////////////////////////////

#include <hpx/hpx_main.hpp>
#include <hpx/apply.hpp>
#include <hpx/include/lcos.hpp>
#include <hpx/hpx.hpp>
#include <hpx/include/iostreams.hpp>

#include <functional>
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart/partitioned_vector_spmd_foreach.cpp
Expand Up @@ -11,7 +11,7 @@
// on the std::vector's the data is stored in.

#include <hpx/hpx_init.hpp>
#include <hpx/include/lcos.hpp>
#include <hpx/hpx.hpp>
#include <hpx/include/partitioned_vector.hpp>
#include <hpx/include/parallel_for_each.hpp>
#include <hpx/include/parallel_generate.hpp>
Expand Down
Expand Up @@ -8,6 +8,7 @@
#define HPX_SIMPLE_CENTRAL_TUPLESPACE_MAR_31_2013_0555PM

#include <hpx/include/components.hpp>
#include <hpx/util/assert.hpp>

#include <string>

Expand Down
Expand Up @@ -9,6 +9,8 @@
#define PARTITIONED_VECTOR_LOCAL_VIEW_ITERATOR_HPP

#include <hpx/components/containers/partitioned_vector/detail/view_element.hpp>
#include <hpx/util/assert.hpp>

#include <boost/iterator/iterator_adaptor.hpp>

#include <utility>
Expand Down
3 changes: 2 additions & 1 deletion hpx/components/iostreams/server/order_output.hpp
@@ -1,4 +1,4 @@
// Copyright (c) 2011-2016 Hartmut Kaiser
// Copyright (c) 2011-2017 Hartmut Kaiser
//
// 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)
Expand All @@ -7,6 +7,7 @@
#define HPX_IOSTREAMS_SERVER_ORDER_OUTPUT_JUL_18_2014_0711PM

#include <hpx/config.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/unlock_guard.hpp>

#include <hpx/components/iostreams/server/buffer.hpp>
Expand Down
3 changes: 2 additions & 1 deletion hpx/lcos/async.hpp
@@ -1,4 +1,4 @@
// Copyright (c) 2007-2016 Hartmut Kaiser
// Copyright (c) 2007-2017 Hartmut Kaiser
//
// 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)
Expand All @@ -20,6 +20,7 @@
#include <hpx/traits/is_launch_policy.hpp>
#include <hpx/traits/is_valid_action.hpp>
#include <hpx/traits/promise_local_result.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/bind.hpp>

#include <type_traits>
Expand Down
2 changes: 1 addition & 1 deletion hpx/lcos/base_lco_with_value.hpp
Expand Up @@ -13,8 +13,8 @@
#include <hpx/runtime/actions/basic_action.hpp>
#include <hpx/runtime/actions/component_action.hpp>
#include <hpx/runtime/components/component_type.hpp>
#include <hpx/runtime/components/server/component.hpp>
#include <hpx/runtime/components/server/managed_component_base.hpp>
#include <hpx/runtime/components/server/component_base.hpp>
#include <hpx/runtime/components_fwd.hpp>
#include <hpx/runtime/naming/id_type.hpp>
#include <hpx/traits/is_component.hpp>
Expand Down
5 changes: 3 additions & 2 deletions hpx/lcos/broadcast.hpp
@@ -1,5 +1,5 @@
// Copyright (c) 2013-2014 Thomas Heller
// Copyright (c) 2013-2014 Hartmut Kaiser
// Copyright (c) 2013-2017 Hartmut Kaiser
//
// 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)
Expand Down Expand Up @@ -145,11 +145,12 @@ namespace hpx { namespace lcos
#include <hpx/throw_exception.hpp>
#include <hpx/traits/extract_action.hpp>
#include <hpx/traits/promise_local_result.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/calculate_fanout.hpp>
#include <hpx/util/detail/pack.hpp>
#include <hpx/util/detail/pp/cat.hpp>
#include <hpx/util/detail/pp/expand.hpp>
#include <hpx/util/detail/pp/nargs.hpp>
#include <hpx/util/detail/pack.hpp>
#include <hpx/util/tuple.hpp>

#include <cstddef>
Expand Down
3 changes: 2 additions & 1 deletion hpx/lcos/channel.hpp
@@ -1,4 +1,4 @@
// Copyright (c) 2016 Hartmut Kaiser
// Copyright (c) 2016-2017 Hartmut Kaiser
//
// 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)
Expand All @@ -13,6 +13,7 @@
#include <hpx/runtime/components/new.hpp>
#include <hpx/runtime/launch_policy.hpp>
#include <hpx/runtime/naming_fwd.hpp>
#include <hpx/util/assert.hpp>

#include <cstddef>
#include <type_traits>
Expand Down
1 change: 1 addition & 0 deletions hpx/lcos/detail/async_implementations.hpp
Expand Up @@ -18,6 +18,7 @@
#include <hpx/traits/component_type_is_compatible.hpp>
#include <hpx/traits/extract_action.hpp>
#include <hpx/traits/future_access.hpp>
#include <hpx/util/assert.hpp>

#include <utility>

Expand Down
7 changes: 4 additions & 3 deletions hpx/lcos/detail/barrier_node.hpp
Expand Up @@ -8,14 +8,15 @@

#include <hpx/config.hpp>
#include <hpx/lcos/base_lco.hpp>
#include <hpx/lcos/local/promise.hpp>
#include <hpx/lcos/future.hpp>
#include <hpx/lcos/local/barrier.hpp>
#include <hpx/lcos/local/promise.hpp>
#include <hpx/lcos/local/spinlock.hpp>
#include <hpx/lcos/future.hpp>
#include <hpx/runtime/components/server/managed_component_base.hpp>
#include <hpx/runtime/naming/id_type.hpp>
#include <hpx/util/atomic_count.hpp>
#include <hpx/traits/managed_component_policies.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/atomic_count.hpp>

#include <cstddef>
#include <string>
Expand Down
3 changes: 2 additions & 1 deletion hpx/lcos/detail/future_data.hpp
Expand Up @@ -12,13 +12,14 @@
#include <hpx/lcos/local/spinlock.hpp>
#include <hpx/runtime/get_worker_thread_num.hpp>
#include <hpx/runtime/launch_policy.hpp>
#include <hpx/runtime/threads/coroutines/detail/get_stack_pointer.hpp>
#include <hpx/runtime/threads/thread_executor.hpp>
#include <hpx/runtime/threads/thread_helpers.hpp>
#include <hpx/runtime/threads/coroutines/detail/get_stack_pointer.hpp>
#include <hpx/throw_exception.hpp>
#include <hpx/traits/future_access.hpp>
#include <hpx/traits/get_remote_result.hpp>
#include <hpx/util/annotated_function.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/assert_owns_lock.hpp>
#include <hpx/util/atomic_count.hpp>
#include <hpx/util/bind.hpp>
Expand Down
1 change: 1 addition & 0 deletions hpx/lcos/future.hpp
Expand Up @@ -28,6 +28,7 @@
#include <hpx/traits/is_future.hpp>
#include <hpx/traits/is_launch_policy.hpp>
#include <hpx/util/always_void.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/bind.hpp>
#include <hpx/util/decay.hpp>
#include <hpx/util/function.hpp>
Expand Down
3 changes: 2 additions & 1 deletion hpx/lcos/future_wait.hpp
@@ -1,4 +1,4 @@
// Copyright (c) 2007-2012 Hartmut Kaiser
// Copyright (c) 2007-2017 Hartmut Kaiser
//
// 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)
Expand All @@ -13,6 +13,7 @@
#include <hpx/traits/acquire_shared_state.hpp>
#include <hpx/traits/future_access.hpp>
#include <hpx/traits/future_traits.hpp>
#include <hpx/util/assert.hpp>

#include <boost/dynamic_bitset.hpp>

Expand Down
5 changes: 3 additions & 2 deletions hpx/lcos/gather.hpp
@@ -1,4 +1,4 @@
// Copyright (c) 2014-2016 Hartmut Kaiser
// Copyright (c) 2014-2017 Hartmut Kaiser
//
// 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)
Expand Down Expand Up @@ -197,12 +197,13 @@ namespace hpx { namespace lcos
#include <hpx/lcos/local/and_gate.hpp>
#include <hpx/lcos/local/spinlock.hpp>
#include <hpx/runtime/basename_registration.hpp>
#include <hpx/runtime/launch_policy.hpp>
#include <hpx/runtime/components/new.hpp>
#include <hpx/runtime/components/server/simple_component_base.hpp>
#include <hpx/runtime/get_num_localities.hpp>
#include <hpx/runtime/launch_policy.hpp>
#include <hpx/runtime/naming/id_type.hpp>
#include <hpx/runtime/naming/unmanaged.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/decay.hpp>
#include <hpx/util/detail/pp/cat.hpp>
#include <hpx/util/detail/pp/expand.hpp>
Expand Down
3 changes: 2 additions & 1 deletion hpx/lcos/latch.hpp
@@ -1,4 +1,4 @@
// Copyright (c) 2007-2015 Hartmut Kaiser
// Copyright (c) 2007-2017 Hartmut Kaiser
//
// 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)
Expand All @@ -10,6 +10,7 @@
#include <hpx/lcos/server/latch.hpp>
#include <hpx/runtime/components/client_base.hpp>
#include <hpx/runtime/components/new.hpp>
#include <hpx/util/assert.hpp>

#include <cstddef>
#include <exception>
Expand Down
3 changes: 2 additions & 1 deletion hpx/lcos/local/latch.hpp
@@ -1,4 +1,4 @@
// Copyright (c) 2015 Hartmut Kaiser
// Copyright (c) 2015-2017 Hartmut Kaiser
//
// 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)
Expand All @@ -10,6 +10,7 @@

#include <hpx/lcos/local/detail/condition_variable.hpp>
#include <hpx/lcos/local/spinlock.hpp>
#include <hpx/util/assert.hpp>

#include <cstddef>
#include <mutex>
Expand Down
3 changes: 2 additions & 1 deletion hpx/lcos/local/recursive_mutex.hpp
@@ -1,4 +1,4 @@
// Copyright (c) 2007-2014 Hartmut Kaiser
// Copyright (c) 2007-2017 Hartmut Kaiser
//
// Part of this code has been adopted from code published under the BSL by:
//
Expand All @@ -12,6 +12,7 @@

#include <hpx/config.hpp>
#include <hpx/lcos/local/spinlock.hpp>
#include <hpx/util/assert.hpp>

#include <atomic>
#include <cstddef>
Expand Down
3 changes: 2 additions & 1 deletion hpx/lcos/local/reinitializable_static.hpp
@@ -1,4 +1,4 @@
// Copyright (c) 2007-2012 Hartmut Kaiser
// Copyright (c) 2007-2017 Hartmut Kaiser
// Copyright (c) 2006 Joao Abecasis
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
Expand All @@ -9,6 +9,7 @@

#include <hpx/config.hpp>
#include <hpx/lcos/local/once.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/bind.hpp>
#include <hpx/util/static_reinit.hpp>

Expand Down
3 changes: 2 additions & 1 deletion hpx/lcos/object_semaphore.hpp
@@ -1,5 +1,5 @@
// Copyright (c) 2011 Bryce Lelbach
// Copyright (c) 2007-2016 Hartmut Kaiser
// Copyright (c) 2007-2017 Hartmut Kaiser
//
// 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)
Expand All @@ -11,6 +11,7 @@
#include <hpx/exception_fwd.hpp>
#include <hpx/lcos/server/object_semaphore.hpp>
#include <hpx/runtime/components/client_base.hpp>
#include <hpx/util/assert.hpp>

#include <cstdint>

Expand Down
3 changes: 2 additions & 1 deletion hpx/lcos/packaged_action.hpp
@@ -1,4 +1,4 @@
// Copyright (c) 2007-2016 Hartmut Kaiser
// Copyright (c) 2007-2017 Hartmut Kaiser
// Copyright (c) 2011 Bryce Lelbach
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
Expand All @@ -18,6 +18,7 @@
#include <hpx/traits/component_supports_migration.hpp>
#include <hpx/traits/component_type_is_compatible.hpp>
#include <hpx/traits/extract_action.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/bind.hpp>
#include <hpx/util/protect.hpp>

Expand Down
3 changes: 2 additions & 1 deletion hpx/lcos/queue.hpp
@@ -1,4 +1,4 @@
// Copyright (c) 2007-2015 Hartmut Kaiser
// Copyright (c) 2007-2017 Hartmut Kaiser
//
// 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)
Expand All @@ -11,6 +11,7 @@
#if defined(HPX_HAVE_QUEUE_COMPATIBILITY)
#include <hpx/lcos/server/queue.hpp>
#include <hpx/runtime/components/client_base.hpp>
#include <hpx/util/assert.hpp>

#include <exception>
#include <utility>
Expand Down
3 changes: 2 additions & 1 deletion hpx/lcos/server/queue.hpp
@@ -1,4 +1,4 @@
// Copyright (c) 2007-2016 Hartmut Kaiser
// Copyright (c) 2007-2017 Hartmut Kaiser
//
// 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)
Expand All @@ -18,6 +18,7 @@
#include <hpx/runtime/components/server/component_base.hpp>
#include <hpx/runtime/threads/thread_helpers.hpp>
#include <hpx/traits/get_remote_result.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/detail/pp/cat.hpp>
#include <hpx/util/detail/pp/expand.hpp>
#include <hpx/util/detail/pp/nargs.hpp>
Expand Down
1 change: 1 addition & 0 deletions hpx/parallel/algorithms/merge.hpp
Expand Up @@ -9,6 +9,7 @@
#include <hpx/config.hpp>
#include <hpx/traits/concepts.hpp>
#include <hpx/traits/is_iterator.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/invoke.hpp>
#include <hpx/util/tagged_tuple.hpp>

Expand Down
1 change: 1 addition & 0 deletions hpx/parallel/algorithms/partition.hpp
Expand Up @@ -15,6 +15,7 @@
#include <hpx/traits/concepts.hpp>
#include <hpx/traits/is_callable.hpp>
#include <hpx/traits/is_iterator.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/invoke.hpp>
#include <hpx/util/tagged_tuple.hpp>
#include <hpx/util/unused.hpp>
Expand Down

0 comments on commit ef2e515

Please sign in to comment.