Skip to content

Commit

Permalink
Deprecate use of BOOST_ASSERT and ensure HPX_ASSERT has corresponding…
Browse files Browse the repository at this point in the history 
… #include present
  • Loading branch information
@hkaiser
hkaiser committed Aug 22, 2017
1 parent 7f3ebe7 commit feed278
Show file tree
Hide file tree
Showing 137 changed files with 257 additions and 96 deletions.
2 changes: 2 additions & 0 deletions hpx/components/containers/partitioned_vector/partitioned_vector_local_view_iterator.hpp
View file
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
View file
@@ -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
View file
@@ -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
3 changes: 2 additions & 1 deletion hpx/lcos/base_lco_with_value.hpp
View file
Expand Up @@ -12,11 +12,12 @@
#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/simple_component_base.hpp>
#include <hpx/runtime/components/server/managed_component_base.hpp>
#include <hpx/runtime/components/server/simple_component_base.hpp>
#include <hpx/runtime/components_fwd.hpp>
#include <hpx/runtime/naming/id_type.hpp>
#include <hpx/traits/is_component.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
5 changes: 3 additions & 2 deletions hpx/lcos/broadcast.hpp
View file
@@ -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
View file
@@ -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
3 changes: 2 additions & 1 deletion hpx/lcos/detail/async_implementations.hpp
View file
@@ -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 @@ -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
View file
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
View file
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
View file
Expand Up @@ -27,6 +27,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
View file
@@ -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/atomic.hpp>
#include <boost/dynamic_bitset.hpp>
Expand Down
5 changes: 3 additions & 2 deletions hpx/lcos/gather.hpp
View file
@@ -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
View file
@@ -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
View file
@@ -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
View file
@@ -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 <boost/atomic.hpp>

Expand Down
3 changes: 2 additions & 1 deletion hpx/lcos/local/reinitializable_static.hpp
View file
@@ -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
View file
@@ -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
View file
@@ -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
View file
@@ -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
View file
@@ -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/partition.hpp
View file
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
3 changes: 2 additions & 1 deletion hpx/parallel/exception_list.hpp
View file
@@ -1,4 +1,4 @@
// Copyright (c) 2007-2014 Hartmut Kaiser
// Copyright (c) 2007-2017 Hartmut Kaiser
// 2017 Taeguk Kwon
//
// Distributed under the Boost Software License, Version 1.0. (See accompanying
Expand All @@ -11,6 +11,7 @@
#include <hpx/exception_list.hpp>
#include <hpx/hpx_finalize.hpp>
#include <hpx/lcos/future.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/decay.hpp>

#include <hpx/parallel/execution_policy_fwd.hpp>
Expand Down
1 change: 1 addition & 0 deletions hpx/parallel/executors/thread_executor_traits.hpp
View file
Expand Up @@ -18,6 +18,7 @@
#include <hpx/parallel/executors/executor_traits.hpp>
#include <hpx/runtime/threads/thread_executor.hpp>
#include <hpx/traits/is_launch_policy.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/decay.hpp>
#include <hpx/util/deferred_call.hpp>
#include <hpx/util/range.hpp>
Expand Down
3 changes: 2 additions & 1 deletion hpx/parallel/segmented_algorithms/detail/dispatch.hpp
View file
@@ -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 @@ -11,6 +11,7 @@
#include <hpx/runtime/components/colocating_distribution_policy.hpp>
#include <hpx/runtime/naming/id_type.hpp>
#include <hpx/traits/segmented_iterator_traits.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/decay.hpp>
#include <hpx/util/tuple.hpp>

Expand Down
1 change: 1 addition & 0 deletions hpx/parallel/segmented_algorithms/detail/transfer.hpp
View file
Expand Up @@ -9,6 +9,7 @@
#include <hpx/config.hpp>
#include <hpx/lcos/local/dataflow.hpp>
#include <hpx/traits/segmented_iterator_traits.hpp>
#include <hpx/util/assert.hpp>

#include <hpx/parallel/algorithms/detail/dispatch.hpp>
#include <hpx/parallel/execution_policy.hpp>
Expand Down
3 changes: 2 additions & 1 deletion hpx/parallel/util/detail/chunk_size.hpp
View file
@@ -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 @@ -8,6 +8,7 @@

#include <hpx/config.hpp>
#include <hpx/lcos/future.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/decay.hpp>
#include <hpx/util/iterator_range.hpp>
#include <hpx/util/tuple.hpp>
Expand Down
1 change: 1 addition & 0 deletions hpx/parallel/util/partitioner.hpp
View file
Expand Up @@ -10,6 +10,7 @@
#include <hpx/dataflow.hpp>
#include <hpx/exception_list.hpp>
#include <hpx/lcos/wait_all.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/decay.hpp>
#include <hpx/util/deferred_call.hpp>
#include <hpx/util/range.hpp>
Expand Down
1 change: 1 addition & 0 deletions hpx/parallel/util/scan_partitioner.hpp
View file
Expand Up @@ -12,6 +12,7 @@
#include <hpx/exception_list.hpp>
#include <hpx/lcos/wait_all.hpp>
#include <hpx/runtime/launch_policy.hpp>
#include <hpx/util/assert.hpp>
#include <hpx/util/bind.hpp>
#include <hpx/util/decay.hpp>
#include <hpx/util/unused.hpp>
Expand Down
1 change: 1 addition & 0 deletions hpx/plugins/parcelport/mpi/receiver.hpp
View file
Expand Up @@ -14,6 +14,7 @@

#include <hpx/plugins/parcelport/mpi/header.hpp>
#include <hpx/plugins/parcelport/mpi/receiver_connection.hpp>
#include <hpx/util/assert.hpp>

#include <algorithm>
#include <iterator>
Expand Down
1 change: 1 addition & 0 deletions hpx/plugins/parcelport/mpi/receiver_connection.hpp
View file
Expand Up @@ -13,6 +13,7 @@
#include <hpx/plugins/parcelport/mpi/header.hpp>
#include <hpx/runtime/parcelset/decode_parcels.hpp>
#include <hpx/runtime/parcelset/parcel_buffer.hpp>
#include <hpx/util/assert.hpp>

#include <cstddef>
#include <cstdint>
Expand Down
1 change: 1 addition & 0 deletions hpx/plugins/parcelport/mpi/sender.hpp
View file
Expand Up @@ -12,6 +12,7 @@
#if defined(HPX_HAVE_PARCELPORT_MPI)

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

#include <hpx/plugins/parcelport/mpi/mpi_environment.hpp>
#include <hpx/plugins/parcelport/mpi/sender_connection.hpp>
Expand Down

0 comments on commit feed278

Please sign in to comment.