Skip to content

Commit

Permalink
Mark C++11 inline namespaces as required
Browse files Browse the repository at this point in the history
  • Loading branch information
@K-ballo
K-ballo committed May 26, 2017
1 parent 7549d8d commit b12b7ee
Show file tree
Hide file tree
Showing 114 changed files with 112 additions and 251 deletions.
2 changes: 1 addition & 1 deletion cmake/HPX_PerformCxxFeatureTests.cmake
View file
Expand Up @@ -46,7 +46,7 @@ macro(hpx_perform_cxx_feature_tests)
REQUIRED "HPX needs support for C++11 defaulted function template arguments")

hpx_check_for_cxx11_inline_namespaces(
DEFINITIONS HPX_HAVE_CXX11_INLINE_NAMESPACES)
REQUIRED "HPX needs support for C++11 inline namespaces")

hpx_check_for_cxx11_lambdas(
REQUIRED "HPX needs support for C++11 lambdas")
Expand Down
17 changes: 0 additions & 17 deletions hpx/config/inline_namespace.hpp
View file

This file was deleted.

3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/adjacent_difference.hpp
View file
Expand Up @@ -13,7 +13,6 @@
#include <hpx/util/zip_iterator.hpp>

#include <hpx/parallel/algorithms/detail/dispatch.hpp>
#include <hpx/parallel/config/inline_namespace.hpp>
#include <hpx/parallel/execution_policy.hpp>
#include <hpx/parallel/util/detail/algorithm_result.hpp>
#include <hpx/parallel/util/loop.hpp>
Expand All @@ -28,7 +27,7 @@
#include <utility>
#include <vector>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
///////////////////////////////////////////////////////////////////////////
// adjacent_difference
Expand Down
2 changes: 1 addition & 1 deletion hpx/parallel/algorithms/adjacent_find.hpp
View file
Expand Up @@ -26,7 +26,7 @@
#include <utility>
#include <vector>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
///////////////////////////////////////////////////////////////////////////
// adjacent_find
Expand Down
3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/all_any_none.hpp
View file
Expand Up @@ -13,7 +13,6 @@
#include <hpx/util/void_guard.hpp>

#include <hpx/parallel/algorithms/detail/dispatch.hpp>
#include <hpx/parallel/config/inline_namespace.hpp>
#include <hpx/parallel/execution_policy.hpp>
#include <hpx/parallel/util/detail/algorithm_result.hpp>
#include <hpx/parallel/util/loop.hpp>
Expand All @@ -29,7 +28,7 @@
#include <utility>
#include <vector>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
///////////////////////////////////////////////////////////////////////////
// none_of
Expand Down
2 changes: 1 addition & 1 deletion hpx/parallel/algorithms/copy.hpp
View file
Expand Up @@ -43,7 +43,7 @@

#include <boost/shared_array.hpp>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
///////////////////////////////////////////////////////////////////////////
// copy
Expand Down
3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/count.hpp
View file
Expand Up @@ -15,7 +15,6 @@
#include <hpx/util/unwrapped.hpp>

#include <hpx/parallel/algorithms/detail/dispatch.hpp>
#include <hpx/parallel/config/inline_namespace.hpp>
#include <hpx/parallel/execution_policy.hpp>
#include <hpx/parallel/traits/vector_pack_count_bits.hpp>
#include <hpx/parallel/util/detail/algorithm_result.hpp>
Expand All @@ -32,7 +31,7 @@
#include <utility>
#include <vector>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
///////////////////////////////////////////////////////////////////////////
// count
Expand Down
2 changes: 1 addition & 1 deletion hpx/parallel/algorithms/detail/dispatch.hpp
View file
Expand Up @@ -26,7 +26,7 @@
#endif
#include <utility>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1) { namespace detail
namespace hpx { namespace parallel { inline namespace v1 { namespace detail
{
///////////////////////////////////////////////////////////////////////////
template <typename Result>
Expand Down
3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/detail/is_negative.hpp
View file
Expand Up @@ -7,11 +7,10 @@
#define HPX_PARALLEL_DETAIL_IS_NEGATIVE_JUL_2014_01_0148PM

#include <hpx/config.hpp>
#include <hpx/parallel/config/inline_namespace.hpp>

#include <type_traits>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1) { namespace detail
namespace hpx { namespace parallel { inline namespace v1 { namespace detail
{
// main template represents non-integral types (raises error)
template <typename Size, typename Enable = void>
Expand Down
3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/detail/predicates.hpp
View file
Expand Up @@ -12,15 +12,14 @@
#include <hpx/util/invoke.hpp>

#include <hpx/parallel/algorithms/detail/is_negative.hpp>
#include <hpx/parallel/config/inline_namespace.hpp>

#include <algorithm>
#include <cstddef>
#include <cstdlib>
#include <type_traits>
#include <utility>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1) { namespace detail
namespace hpx { namespace parallel { inline namespace v1 { namespace detail
{
template<typename InputIterator, typename Distance>
HPX_HOST_DEVICE void advance_impl(InputIterator& i, Distance n,
Expand Down
3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/detail/set_operation.hpp
View file
Expand Up @@ -9,7 +9,6 @@
#include <hpx/config.hpp>
#include <hpx/util/assert.hpp>

#include <hpx/parallel/config/inline_namespace.hpp>
#include <hpx/parallel/execution_policy.hpp>
#include <hpx/parallel/executors/execution_information.hpp>
#include <hpx/parallel/util/detail/algorithm_result.hpp>
Expand All @@ -22,7 +21,7 @@
#include <type_traits>
#include <vector>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1) { namespace detail
namespace hpx { namespace parallel { inline namespace v1 { namespace detail
{
/// \cond NOINTERNAL

Expand Down
2 changes: 1 addition & 1 deletion hpx/parallel/algorithms/detail/transfer.hpp
View file
Expand Up @@ -20,7 +20,7 @@
#include <type_traits>
#include <utility>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
///////////////////////////////////////////////////////////////////////////
// transfer
Expand Down
3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/equal.hpp
View file
Expand Up @@ -13,7 +13,6 @@

#include <hpx/parallel/algorithms/detail/dispatch.hpp>
#include <hpx/parallel/algorithms/detail/predicates.hpp>
#include <hpx/parallel/config/inline_namespace.hpp>
#include <hpx/parallel/execution_policy.hpp>
#include <hpx/parallel/util/detail/algorithm_result.hpp>
#include <hpx/parallel/util/loop.hpp>
Expand All @@ -30,7 +29,7 @@
#include <utility>
#include <vector>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
///////////////////////////////////////////////////////////////////////////
// equal (binary)
Expand Down
3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/exclusive_scan.hpp
View file
Expand Up @@ -17,7 +17,6 @@

#include <hpx/parallel/algorithms/detail/dispatch.hpp>
#include <hpx/parallel/algorithms/inclusive_scan.hpp>
#include <hpx/parallel/config/inline_namespace.hpp>
#include <hpx/parallel/execution_policy.hpp>
#include <hpx/parallel/util/detail/algorithm_result.hpp>
#include <hpx/parallel/util/loop.hpp>
Expand All @@ -33,7 +32,7 @@
#include <utility>
#include <vector>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
///////////////////////////////////////////////////////////////////////////
// exclusive_scan
Expand Down
3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/fill.hpp
View file
Expand Up @@ -16,7 +16,6 @@
#include <hpx/parallel/algorithms/for_each.hpp>
#include <hpx/parallel/algorithms/detail/dispatch.hpp>
#include <hpx/parallel/algorithms/detail/is_negative.hpp>
#include <hpx/parallel/config/inline_namespace.hpp>
#include <hpx/parallel/execution_policy.hpp>
#include <hpx/parallel/util/detail/algorithm_result.hpp>
#include <hpx/parallel/util/projection_identity.hpp>
Expand All @@ -27,7 +26,7 @@
#include <type_traits>
#include <utility>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
///////////////////////////////////////////////////////////////////////////
// fill
Expand Down
2 changes: 1 addition & 1 deletion hpx/parallel/algorithms/find.hpp
View file
Expand Up @@ -25,7 +25,7 @@
#include <utility>
#include <vector>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
///////////////////////////////////////////////////////////////////////////
// find
Expand Down
3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/for_each.hpp
View file
Expand Up @@ -24,7 +24,6 @@

#include <hpx/parallel/algorithms/detail/dispatch.hpp>
#include <hpx/parallel/algorithms/detail/is_negative.hpp>
#include <hpx/parallel/config/inline_namespace.hpp>
#include <hpx/parallel/execution_policy.hpp>
#include <hpx/parallel/traits/projected.hpp>
#include <hpx/parallel/util/detail/algorithm_result.hpp>
Expand All @@ -39,7 +38,7 @@
#include <type_traits>
#include <utility>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
///////////////////////////////////////////////////////////////////////////
// for_each_n
Expand Down
3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/for_loop.hpp
View file
Expand Up @@ -27,7 +27,6 @@
#include <hpx/parallel/algorithms/detail/predicates.hpp>
#include <hpx/parallel/algorithms/for_loop_induction.hpp>
#include <hpx/parallel/algorithms/for_loop_reduction.hpp>
#include <hpx/parallel/config/inline_namespace.hpp>
#include <hpx/parallel/execution_policy.hpp>
#include <hpx/parallel/util/detail/algorithm_result.hpp>
#include <hpx/parallel/util/loop.hpp>
Expand All @@ -41,7 +40,7 @@
#include <utility>
#include <vector>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v2)
namespace hpx { namespace parallel { inline namespace v2
{
// for_loop
namespace detail
Expand Down
3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/for_loop_induction.hpp
View file
Expand Up @@ -12,14 +12,13 @@
#include <hpx/util/decay.hpp>

#include <hpx/parallel/algorithms/detail/predicates.hpp>
#include <hpx/parallel/config/inline_namespace.hpp>

#include <cstddef>
#include <cstdlib>
#include <type_traits>
#include <utility>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v2)
namespace hpx { namespace parallel { inline namespace v2
{
namespace detail
{
Expand Down
3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/for_loop_reduction.hpp
View file
Expand Up @@ -15,7 +15,6 @@
#include <hpx/util/decay.hpp>

#include <hpx/parallel/algorithms/detail/predicates.hpp>
#include <hpx/parallel/config/inline_namespace.hpp>

#include <boost/shared_array.hpp>

Expand All @@ -25,7 +24,7 @@
#include <type_traits>
#include <utility>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v2)
namespace hpx { namespace parallel { inline namespace v2
{
namespace detail
{
Expand Down
2 changes: 1 addition & 1 deletion hpx/parallel/algorithms/generate.hpp
View file
Expand Up @@ -26,7 +26,7 @@
#include <type_traits>
#include <utility>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
///////////////////////////////////////////////////////////////////////////
// generate
Expand Down
3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/includes.hpp
View file
Expand Up @@ -13,7 +13,6 @@

#include <hpx/parallel/algorithms/detail/dispatch.hpp>
#include <hpx/parallel/algorithms/detail/predicates.hpp>
#include <hpx/parallel/config/inline_namespace.hpp>
#include <hpx/parallel/execution_policy.hpp>
#include <hpx/parallel/util/cancellation_token.hpp>
#include <hpx/parallel/util/detail/algorithm_result.hpp>
Expand All @@ -28,7 +27,7 @@
#include <utility>
#include <vector>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
///////////////////////////////////////////////////////////////////////////
// includes
Expand Down
3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/inclusive_scan.hpp
View file
Expand Up @@ -16,7 +16,6 @@
#include <hpx/util/zip_iterator.hpp>

#include <hpx/parallel/algorithms/detail/dispatch.hpp>
#include <hpx/parallel/config/inline_namespace.hpp>
#include <hpx/parallel/execution_policy.hpp>
#include <hpx/parallel/util/detail/algorithm_result.hpp>
#include <hpx/parallel/util/loop.hpp>
Expand All @@ -32,7 +31,7 @@
#include <utility>
#include <vector>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
///////////////////////////////////////////////////////////////////////////
// inclusive_scan
Expand Down
2 changes: 1 addition & 1 deletion hpx/parallel/algorithms/inner_product.hpp
View file
Expand Up @@ -19,7 +19,7 @@
#include <type_traits>
#include <utility>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
///////////////////////////////////////////////////////////////////////////
/// Returns the result of accumulating init with the inner products of the
Expand Down
3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/is_partitioned.hpp
View file
Expand Up @@ -13,7 +13,6 @@
#include <hpx/traits/is_iterator.hpp>

#include <hpx/parallel/algorithms/detail/dispatch.hpp>
#include <hpx/parallel/config/inline_namespace.hpp>
#include <hpx/parallel/execution_policy.hpp>
#include <hpx/parallel/util/cancellation_token.hpp>
#include <hpx/parallel/util/detail/algorithm_result.hpp>
Expand All @@ -29,7 +28,7 @@
#include <utility>
#include <vector>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
////////////////////////////////////////////////////////////////////////////
// is_partitioned
Expand Down
3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/is_sorted.hpp
View file
Expand Up @@ -13,7 +13,6 @@
#include <hpx/util/invoke.hpp>

#include <hpx/parallel/algorithms/detail/dispatch.hpp>
#include <hpx/parallel/config/inline_namespace.hpp>
#include <hpx/parallel/execution_policy.hpp>
#include <hpx/parallel/util/cancellation_token.hpp>
#include <hpx/parallel/util/detail/algorithm_result.hpp>
Expand All @@ -31,7 +30,7 @@
#include <utility>
#include <vector>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
////////////////////////////////////////////////////////////////////////////
// is_sorted
Expand Down
2 changes: 1 addition & 1 deletion hpx/parallel/algorithms/lexicographical_compare.hpp
View file
Expand Up @@ -28,7 +28,7 @@
#include <utility>
#include <vector>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
///////////////////////////////////////////////////////////////////////////
// lexicographical_compare
Expand Down
3 changes: 1 addition & 2 deletions hpx/parallel/algorithms/minmax.hpp
View file
Expand Up @@ -19,7 +19,6 @@
#include <hpx/util/tagged_pair.hpp>

#include <hpx/parallel/algorithms/detail/dispatch.hpp>
#include <hpx/parallel/config/inline_namespace.hpp>
#include <hpx/parallel/execution_policy.hpp>
#include <hpx/parallel/tagspec.hpp>
#include <hpx/parallel/traits/projected.hpp>
Expand All @@ -36,7 +35,7 @@
#include <utility>
#include <vector>

namespace hpx { namespace parallel { HPX_INLINE_NAMESPACE(v1)
namespace hpx { namespace parallel { inline namespace v1
{
///////////////////////////////////////////////////////////////////////////
// min_element
Expand Down

0 comments on commit b12b7ee

Please sign in to comment.