[libcxx-commits] [pstl] r358131 - [pstl] Move to single underscore-capital for macros and include guards
Louis Dionne via libcxx-commits
libcxx-commits at lists.llvm.org
Wed Apr 10 12:51:41 PDT 2019
Author: ldionne
Date: Wed Apr 10 12:51:40 2019
New Revision: 358131
URL: http://llvm.org/viewvc/llvm-project?rev=358131&view=rev
Log:
[pstl] Move to single underscore-capital for macros and include guards
Summary: Per the LLVM convention.
Reviewers: rodgert
Subscribers: jkorous, dexonsmith, jdoerfert, libcxx-commits
Tags: #libc
Differential Revision: https://reviews.llvm.org/D60521
Modified:
pstl/trunk/include/pstl/algorithm
pstl/trunk/include/pstl/execution
pstl/trunk/include/pstl/internal/algorithm_fwd.h
pstl/trunk/include/pstl/internal/algorithm_impl.h
pstl/trunk/include/pstl/internal/execution_defs.h
pstl/trunk/include/pstl/internal/execution_impl.h
pstl/trunk/include/pstl/internal/glue_algorithm_defs.h
pstl/trunk/include/pstl/internal/glue_algorithm_impl.h
pstl/trunk/include/pstl/internal/glue_execution_defs.h
pstl/trunk/include/pstl/internal/glue_memory_defs.h
pstl/trunk/include/pstl/internal/glue_memory_impl.h
pstl/trunk/include/pstl/internal/glue_numeric_defs.h
pstl/trunk/include/pstl/internal/glue_numeric_impl.h
pstl/trunk/include/pstl/internal/memory_impl.h
pstl/trunk/include/pstl/internal/numeric_fwd.h
pstl/trunk/include/pstl/internal/numeric_impl.h
pstl/trunk/include/pstl/internal/parallel_backend.h
pstl/trunk/include/pstl/internal/parallel_backend_tbb.h
pstl/trunk/include/pstl/internal/parallel_backend_utils.h
pstl/trunk/include/pstl/internal/parallel_impl.h
pstl/trunk/include/pstl/internal/pstl_config.h
pstl/trunk/include/pstl/internal/unseq_backend_simd.h
pstl/trunk/include/pstl/internal/utils.h
pstl/trunk/include/pstl/memory
pstl/trunk/include/pstl/numeric
pstl/trunk/test/std/algorithms/alg.merge/inplace_merge.pass.cpp
pstl/trunk/test/std/algorithms/alg.merge/merge.pass.cpp
pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp
pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp
pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
pstl/trunk/test/std/algorithms/alg.modifying.operations/copy_move.pass.cpp
pstl/trunk/test/std/algorithms/alg.modifying.operations/remove.pass.cpp
pstl/trunk/test/std/algorithms/alg.modifying.operations/replace_copy.pass.cpp
pstl/trunk/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp
pstl/trunk/test/std/algorithms/alg.modifying.operations/rotate_copy.pass.cpp
pstl/trunk/test/std/algorithms/alg.modifying.operations/unique.pass.cpp
pstl/trunk/test/std/algorithms/alg.modifying.operations/unique_copy_equal.pass.cpp
pstl/trunk/test/std/algorithms/alg.nonmodifying/all_of.pass.cpp
pstl/trunk/test/std/algorithms/alg.nonmodifying/any_of.pass.cpp
pstl/trunk/test/std/algorithms/alg.nonmodifying/count.pass.cpp
pstl/trunk/test/std/algorithms/alg.nonmodifying/equal.pass.cpp
pstl/trunk/test/std/algorithms/alg.nonmodifying/find.pass.cpp
pstl/trunk/test/std/algorithms/alg.nonmodifying/find_end.pass.cpp
pstl/trunk/test/std/algorithms/alg.nonmodifying/find_first_of.pass.cpp
pstl/trunk/test/std/algorithms/alg.nonmodifying/find_if.pass.cpp
pstl/trunk/test/std/algorithms/alg.nonmodifying/none_of.pass.cpp
pstl/trunk/test/std/algorithms/alg.nonmodifying/nth_element.pass.cpp
pstl/trunk/test/std/algorithms/alg.nonmodifying/search_n.pass.cpp
pstl/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is_heap.pass.cpp
pstl/trunk/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
pstl/trunk/test/std/algorithms/alg.sorting/partial_sort.pass.cpp
pstl/trunk/test/std/algorithms/alg.sorting/partial_sort_copy.pass.cpp
pstl/trunk/test/std/numerics/numeric.ops/adjacent_difference.pass.cpp
pstl/trunk/test/std/numerics/numeric.ops/reduce.pass.cpp
pstl/trunk/test/std/numerics/numeric.ops/scan.pass.cpp
pstl/trunk/test/std/numerics/numeric.ops/transform_scan.pass.cpp
pstl/trunk/test/std/utilities/memory/specialized.algorithms/uninitialized_construct.pass.cpp
pstl/trunk/test/std/utilities/memory/specialized.algorithms/uninitialized_copy_move.pass.cpp
pstl/trunk/test/support/pstl_test_config.h
pstl/trunk/test/support/utils.h
Modified: pstl/trunk/include/pstl/algorithm
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/algorithm?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/algorithm (original)
+++ pstl/trunk/include/pstl/algorithm Wed Apr 10 12:51:40 2019
@@ -7,18 +7,18 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_algorithm
-#define __PSTL_algorithm
+#ifndef _PSTL_ALGORITHM
+#define _PSTL_ALGORITHM
#include "internal/pstl_config.h"
-#if __PSTL_EXECUTION_POLICIES_DEFINED
+#if _PSTL_EXECUTION_POLICIES_DEFINED
// If <execution> has already been included, pull in implementations
# include "internal/glue_algorithm_impl.h"
#else
// Otherwise just pull in forward declarations
# include "internal/glue_algorithm_defs.h"
-# define __PSTL_ALGORITHM_FORWARD_DECLARED 1
+# define _PSTL_ALGORITHM_FORWARD_DECLARED 1
#endif
-#endif /* __PSTL_algorithm */
+#endif /* _PSTL_ALGORITHM */
Modified: pstl/trunk/include/pstl/execution
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/execution?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/execution (original)
+++ pstl/trunk/include/pstl/execution Wed Apr 10 12:51:40 2019
@@ -7,31 +7,31 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_execution
-#define __PSTL_execution
+#ifndef _PSTL_EXECUTION
+#define _PSTL_EXECUTION
#include "internal/pstl_config.h"
#include "internal/execution_defs.h"
-#define __PSTL_EXECUTION_POLICIES_DEFINED 1
+#define _PSTL_EXECUTION_POLICIES_DEFINED 1
-#if __PSTL_ALGORITHM_FORWARD_DECLARED
+#if _PSTL_ALGORITHM_FORWARD_DECLARED
# include "internal/glue_algorithm_impl.h"
#endif
-#if __PSTL_MEMORY_FORWARD_DECLARED
+#if _PSTL_MEMORY_FORWARD_DECLARED
# include "internal/glue_memory_impl.h"
#endif
-#if __PSTL_NUMERIC_FORWARD_DECLARED
+#if _PSTL_NUMERIC_FORWARD_DECLARED
# include "internal/glue_numeric_impl.h"
#endif
-#if __PSTL_CPP17_EXECUTION_POLICIES_PRESENT
-__PSTL_PRAGMA_MESSAGE_POLICIES("The <Parallel STL> execution policies are defined in the namespace __pstl::execution")
+#if _PSTL_CPP17_EXECUTION_POLICIES_PRESENT
+_PSTL_PRAGMA_MESSAGE_POLICIES("The <Parallel STL> execution policies are defined in the namespace __pstl::execution")
#else
# include "internal/glue_execution_defs.h"
-__PSTL_PRAGMA_MESSAGE_POLICIES(
+_PSTL_PRAGMA_MESSAGE_POLICIES(
"The <Parallel STL> execution policies are injected into the standard namespace std::execution")
#endif
@@ -43,6 +43,6 @@ namespace execution
{
using namespace __pstl::execution;
}
-}
+} // namespace pstl
-#endif /* __PSTL_execution */
+#endif /* _PSTL_EXECUTION */
Modified: pstl/trunk/include/pstl/internal/algorithm_fwd.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/algorithm_fwd.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/algorithm_fwd.h (original)
+++ pstl/trunk/include/pstl/internal/algorithm_fwd.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_algorithm_fwd_H
-#define __PSTL_algorithm_fwd_H
+#ifndef _PSTL_ALGORITHM_FWD_H
+#define _PSTL_ALGORITHM_FWD_H
#include <type_traits>
#include <utility>
@@ -37,7 +37,7 @@ bool
__pattern_any_of(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Pred, _IsVector,
/*parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _Pred, class _IsVector>
bool
__pattern_any_of(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Pred, _IsVector,
@@ -63,7 +63,7 @@ void
__pattern_walk1(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Function, _IsVector,
/*parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _Function, class _IsVector>
void
__pattern_walk1(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Function, _IsVector,
@@ -75,7 +75,7 @@ void
__pattern_walk_brick(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Brick,
/*parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _Brick>
void
__pattern_walk_brick(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Brick,
@@ -99,7 +99,7 @@ _ForwardIterator
__pattern_walk1_n(_ExecutionPolicy&&, _ForwardIterator, _Size, _Function, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _Size, class _Function, class _IsVector>
_RandomAccessIterator
__pattern_walk1_n(_ExecutionPolicy&&, _RandomAccessIterator, _Size, _Function, _IsVector,
@@ -111,7 +111,7 @@ _ForwardIterator
__pattern_walk_brick_n(_ExecutionPolicy&&, _ForwardIterator, _Size, _Brick,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _Size, class _Brick>
_RandomAccessIterator
__pattern_walk_brick_n(_ExecutionPolicy&&, _RandomAccessIterator, _Size, _Brick,
@@ -145,7 +145,7 @@ _ForwardIterator2
__pattern_walk2(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _Function, _IsVector,
/*parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Function, class _IsVector>
_ForwardIterator2
__pattern_walk2(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _Function, _IsVector,
@@ -158,7 +158,7 @@ _ForwardIterator2
__pattern_walk2_n(_ExecutionPolicy&&, _ForwardIterator1, _Size, _ForwardIterator2, _Function, _IsVector,
/*parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator1, class _Size, class _RandomAccessIterator2,
class _Function, class _IsVector>
_RandomAccessIterator2
@@ -171,7 +171,7 @@ _ForwardIterator2
__pattern_walk2_brick(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _Brick,
/*parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _Brick>
_RandomAccessIterator2
__pattern_walk2_brick(_ExecutionPolicy&&, _RandomAccessIterator1, _RandomAccessIterator1, _RandomAccessIterator2,
@@ -184,7 +184,7 @@ _ForwardIterator2
__pattern_walk2_brick_n(_ExecutionPolicy&&, _ForwardIterator1, _Size, _ForwardIterator2, _Brick,
/*parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator1, class _Size, class _RandomAccessIterator2, class _Brick>
_RandomAccessIterator2
__pattern_walk2_brick_n(_ExecutionPolicy&&, _RandomAccessIterator1, _Size, _RandomAccessIterator2, _Brick,
@@ -213,7 +213,7 @@ __pattern_walk3(_ExecutionPolicy&&, _For
_Function, _IsVector,
/*parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2,
class _RandomAccessIterator3, class _Function, class _IsVector>
_RandomAccessIterator3
@@ -239,7 +239,7 @@ bool
__pattern_equal(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _BinaryPredicate,
_IsVector, /* is_parallel = */ std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _BinaryPredicate,
class _IsVector>
bool
@@ -261,7 +261,7 @@ bool
__pattern_equal(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _ForwardIterator2,
_BinaryPredicate, _IsVector, /* is_parallel = */ std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _BinaryPredicate,
class _IsVector>
bool
@@ -286,7 +286,7 @@ _ForwardIterator
__pattern_find_if(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Predicate, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _Predicate, class _IsVector>
_ForwardIterator
__pattern_find_if(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Predicate, _IsVector,
@@ -314,7 +314,7 @@ __pattern_find_end(_ExecutionPolicy&&, _
_BinaryPredicate, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate,
class _IsVector>
_ForwardIterator1
@@ -343,7 +343,7 @@ _ForwardIterator1
__pattern_find_first_of(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _ForwardIterator2,
_BinaryPredicate, _IsVector, /*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate,
class _IsVector>
_ForwardIterator1
@@ -372,7 +372,7 @@ __pattern_search(_ExecutionPolicy&&, _Fo
_BinaryPredicate, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate,
class _IsVector>
_ForwardIterator1
@@ -402,7 +402,7 @@ __pattern_search_n(_ExecutionPolicy&&, _
IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _Size, class _Tp, class _BinaryPredicate,
class IsVector>
_RandomAccessIterator
@@ -506,7 +506,7 @@ _OutputIterator
__pattern_copy_if(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _OutputIterator, _UnaryPredicate, _IsVector,
/*parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator, class _UnaryPredicate,
class _IsVector>
_OutputIterator
@@ -533,7 +533,7 @@ typename std::iterator_traits<_ForwardIt
__pattern_count(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Predicate,
/* is_parallel */ std::false_type, _IsVector) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _Predicate, class _IsVector>
typename std::iterator_traits<_ForwardIterator>::difference_type
__pattern_count(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Predicate,
@@ -557,7 +557,7 @@ _ForwardIterator
__pattern_unique(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _BinaryPredicate, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _BinaryPredicate, class _IsVector>
_ForwardIterator
__pattern_unique(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _BinaryPredicate, _IsVector,
@@ -592,7 +592,7 @@ _DifferenceType
__brick_calc_mask_2(_RandomAccessIterator, _RandomAccessIterator, bool* __restrict, _BinaryPredicate,
/*vector=*/std::true_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator, class _BinaryPredicate,
class _IsVector>
_OutputIterator
@@ -625,7 +625,7 @@ void
__pattern_reverse(_ExecutionPolicy&&, _BidirectionalIterator, _BidirectionalIterator, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _BidirectionalIterator, class _IsVector>
void
__pattern_reverse(_ExecutionPolicy&&, _BidirectionalIterator, _BidirectionalIterator, _IsVector,
@@ -649,7 +649,7 @@ _OutputIterator
__pattern_reverse_copy(_ExecutionPolicy&&, _BidirectionalIterator, _BidirectionalIterator, _OutputIterator, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _BidirectionalIterator, class _OutputIterator, class _IsVector>
_OutputIterator
__pattern_reverse_copy(_ExecutionPolicy&&, _BidirectionalIterator, _BidirectionalIterator, _OutputIterator, _IsVector,
@@ -673,7 +673,7 @@ _ForwardIterator
__pattern_rotate(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _ForwardIterator, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _IsVector>
_ForwardIterator
__pattern_rotate(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _ForwardIterator, _IsVector,
@@ -698,7 +698,7 @@ __pattern_rotate_copy(_ExecutionPolicy&&
_IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _OutputIterator, class _IsVector>
_OutputIterator
__pattern_rotate_copy(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _ForwardIterator, _OutputIterator,
@@ -723,7 +723,7 @@ bool
__pattern_is_partitioned(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _UnaryPredicate, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _UnaryPredicate, class _IsVector>
bool
__pattern_is_partitioned(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _UnaryPredicate, _IsVector,
@@ -747,7 +747,7 @@ _ForwardIterator
__pattern_partition(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _UnaryPredicate, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _UnaryPredicate, class _IsVector>
_ForwardIterator
__pattern_partition(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _UnaryPredicate, _IsVector,
@@ -772,7 +772,7 @@ __pattern_stable_partition(_ExecutionPol
_IsVector,
/*is_parallelization=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _BidirectionalIterator, class _UnaryPredicate, class _IsVector>
_BidirectionalIterator
__pattern_stable_partition(_ExecutionPolicy&&, _BidirectionalIterator, _BidirectionalIterator, _UnaryPredicate,
@@ -801,7 +801,7 @@ __pattern_partition_copy(_ExecutionPolic
_UnaryPredicate, _IsVector,
/*is_parallelization=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator1, class _OutputIterator2,
class _UnaryPredicate, class _IsVector>
std::pair<_OutputIterator1, _OutputIterator2>
@@ -820,7 +820,7 @@ void
__pattern_sort(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _Compare, _IsVector /*is_vector*/,
/*is_parallel=*/std::false_type, _IsMoveConstructible) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector>
void
__pattern_sort(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _Compare, _IsVector /*is_vector*/,
@@ -838,7 +838,7 @@ __pattern_stable_sort(_ExecutionPolicy&&
_IsVector /*is_vector*/,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector>
void
__pattern_stable_sort(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _Compare,
@@ -856,7 +856,7 @@ __pattern_partial_sort(_ExecutionPolicy&
_Compare, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector>
void
__pattern_partial_sort(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _RandomAccessIterator,
@@ -874,7 +874,7 @@ __pattern_partial_sort_copy(_ExecutionPo
_RandomAccessIterator, _Compare, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _RandomAccessIterator, class _Compare, class _IsVector>
_RandomAccessIterator
__pattern_partial_sort_copy(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _RandomAccessIterator,
@@ -901,7 +901,7 @@ _ForwardIterator
__pattern_adjacent_find(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _BinaryPredicate,
/* is_parallel */ std::false_type, _IsVector, bool) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _BinaryPredicate, class _IsVector>
_RandomAccessIterator
__pattern_adjacent_find(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _BinaryPredicate,
@@ -917,7 +917,7 @@ __pattern_nth_element(_ExecutionPolicy&&
_IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector>
void
__pattern_nth_element(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _RandomAccessIterator, _Compare,
@@ -943,7 +943,7 @@ void
__pattern_fill(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, const _Tp&,
/*is_parallel=*/std::false_type, _IsVector) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _Tp, class _IsVector>
_ForwardIterator
__pattern_fill(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, const _Tp&,
@@ -965,7 +965,7 @@ _OutputIterator
__pattern_fill_n(_ExecutionPolicy&&, _OutputIterator, _Size, const _Tp&,
/*is_parallel=*/std::false_type, _IsVector) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _OutputIterator, class _Size, class _Tp, class _IsVector>
_OutputIterator
__pattern_fill_n(_ExecutionPolicy&&, _OutputIterator, _Size, const _Tp&,
@@ -989,7 +989,7 @@ void
__pattern_generate(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Generator,
/*is_parallel=*/std::false_type, _IsVector) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _Generator, class _IsVector>
_ForwardIterator
__pattern_generate(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Generator,
@@ -1009,7 +1009,7 @@ OutputIterator
__pattern_generate_n(_ExecutionPolicy&&, OutputIterator, Size, _Generator,
/*is_parallel=*/std::false_type, _IsVector) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class OutputIterator, class Size, class _Generator, class _IsVector>
OutputIterator
__pattern_generate_n(_ExecutionPolicy&&, OutputIterator, Size, _Generator,
@@ -1032,7 +1032,7 @@ _ForwardIterator
__pattern_remove_if(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _UnaryPredicate, _IsVector,
/*is_parallel*/ std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _UnaryPredicate, class _IsVector>
_ForwardIterator
__pattern_remove_if(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _UnaryPredicate, _IsVector,
@@ -1059,7 +1059,7 @@ _OutputIterator
__pattern_merge(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _ForwardIterator2,
_OutputIterator, _Compare, _IsVector, /* is_parallel = */ std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _OutputIterator,
class _Compare, class _IsVector>
_OutputIterator
@@ -1086,7 +1086,7 @@ __pattern_inplace_merge(_ExecutionPolicy
_Compare, _IsVector,
/* is_parallel = */ std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _BidirectionalIterator, class _Compare, class _IsVector>
void
__pattern_inplace_merge(_ExecutionPolicy&&, _BidirectionalIterator, _BidirectionalIterator, _BidirectionalIterator,
@@ -1104,7 +1104,7 @@ __pattern_includes(_ExecutionPolicy&&, _
_Compare, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Compare, class _IsVector>
bool
__pattern_includes(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _ForwardIterator2,
@@ -1132,7 +1132,7 @@ _OutputIterator
__pattern_set_union(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _ForwardIterator2,
_OutputIterator, _Compare, _IsVector, /*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator,
class _Compare, class _IsVector>
_OutputIterator
@@ -1161,7 +1161,7 @@ __pattern_set_intersection(_ExecutionPol
_ForwardIterator2, _OutputIterator, _Compare, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator,
class _Compare, class _IsVector>
_OutputIterator
@@ -1189,7 +1189,7 @@ _OutputIterator
__pattern_set_difference(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2, _ForwardIterator2,
_OutputIterator, _Compare, _IsVector, /*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator,
class _Compare, class _IsVector>
_OutputIterator
@@ -1218,7 +1218,7 @@ __pattern_set_symmetric_difference(_Exec
_ForwardIterator2, _OutputIterator, _Compare, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator,
class _Compare, class _IsVector>
_OutputIterator
@@ -1244,7 +1244,7 @@ _RandomAccessIterator
__pattern_is_heap_until(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _Compare, _IsVector,
/* is_parallel = */ std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector>
_RandomAccessIterator
__pattern_is_heap_until(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _Compare, _IsVector,
@@ -1268,7 +1268,7 @@ _ForwardIterator
__pattern_min_element(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Compare, _IsVector,
/* is_parallel = */ std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <typename _ExecutionPolicy, typename _RandomAccessIterator, typename _Compare, typename _IsVector>
_RandomAccessIterator
__pattern_min_element(_ExecutionPolicy&&, _RandomAccessIterator, _RandomAccessIterator, _Compare, _IsVector,
@@ -1292,7 +1292,7 @@ std::pair<_ForwardIterator, _ForwardIter
__pattern_minmax_element(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Compare, _IsVector,
/* is_parallel = */ std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <typename _ExecutionPolicy, typename _ForwardIterator, typename _Compare, typename _IsVector>
std::pair<_ForwardIterator, _ForwardIterator>
__pattern_minmax_element(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _Compare, _IsVector,
@@ -1319,7 +1319,7 @@ __pattern_mismatch(_ExecutionPolicy&&, _
_Predicate, _IsVector,
/* is_parallel = */ std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _Predicate,
class _IsVector>
std::pair<_RandomAccessIterator1, _RandomAccessIterator2>
@@ -1346,7 +1346,7 @@ bool
__pattern_lexicographical_compare(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2,
_ForwardIterator2, _Compare, _IsVector, /* is_parallel = */ std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Compare, class _IsVector>
bool
__pattern_lexicographical_compare(_ExecutionPolicy&&, _ForwardIterator1, _ForwardIterator1, _ForwardIterator2,
@@ -1355,4 +1355,4 @@ __pattern_lexicographical_compare(_Execu
} // namespace __internal
} // namespace __pstl
-#endif /* __PSTL_algorithm_fwd_H */
+#endif /* _PSTL_ALGORITHM_FWD_H */
Modified: pstl/trunk/include/pstl/internal/algorithm_impl.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/algorithm_impl.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/algorithm_impl.h (original)
+++ pstl/trunk/include/pstl/internal/algorithm_impl.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_algorithm_impl_H
-#define __PSTL_algorithm_impl_H
+#ifndef _PSTL_ALGORITHM_IMPL_H
+#define _PSTL_ALGORITHM_IMPL_H
#include <iterator>
#include <type_traits>
@@ -21,7 +21,7 @@
#include "parallel_backend_utils.h"
#include "unseq_backend_simd.h"
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
# include "parallel_backend.h"
# include "parallel_impl.h"
#endif
@@ -59,7 +59,7 @@ __pattern_any_of(_ExecutionPolicy&&, _Fo
return __internal::__brick_any_of(__first, __last, __pred, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _Pred, class _IsVector>
bool
__pattern_any_of(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Pred __pred,
@@ -115,7 +115,7 @@ __pattern_walk1(_ExecutionPolicy&&, _For
__internal::__brick_walk1(__first, __last, __f, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _Function, class _IsVector>
void
__pattern_walk1(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Function __f,
@@ -139,7 +139,7 @@ __pattern_walk_brick(_ExecutionPolicy&&,
__brick(__first, __last);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _Brick>
void
__pattern_walk_brick(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Brick __brick,
@@ -179,7 +179,7 @@ __pattern_walk1_n(_ExecutionPolicy&&, _F
return __internal::__brick_walk1_n(__first, __n, __f, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _Size, class _Function, class _IsVector>
_RandomAccessIterator
__pattern_walk1_n(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _Size __n, _Function __f,
@@ -200,7 +200,7 @@ __pattern_walk_brick_n(_ExecutionPolicy&
return __brick(__first, __n);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _Size, class _Brick>
_RandomAccessIterator
__pattern_walk_brick_n(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _Size __n, _Brick __brick,
@@ -264,7 +264,7 @@ __pattern_walk2(_ExecutionPolicy&&, _For
return __internal::__brick_walk2(__first1, __last1, __first2, __f, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Function, class _IsVector>
_ForwardIterator2
__pattern_walk2(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1,
@@ -308,7 +308,7 @@ __pattern_walk2_brick(_ExecutionPolicy&&
return __brick(__first1, __last1, __first2);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _Brick>
_RandomAccessIterator2
__pattern_walk2_brick(_ExecutionPolicy&& __exec, _RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1,
@@ -325,7 +325,7 @@ __pattern_walk2_brick(_ExecutionPolicy&&
}
#endif
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator1, class _Size, class _RandomAccessIterator2, class _Brick>
_RandomAccessIterator2
__pattern_walk2_brick_n(_ExecutionPolicy&& __exec, _RandomAccessIterator1 __first1, _Size __n,
@@ -382,7 +382,7 @@ __pattern_walk3(_ExecutionPolicy&&, _For
return __internal::__brick_walk3(__first1, __last1, __first2, __first3, __f, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2,
class _RandomAccessIterator3, class _Function, class _IsVector>
_RandomAccessIterator3
@@ -437,7 +437,7 @@ __pattern_equal(_ExecutionPolicy&&, _For
return __internal::__brick_equal(__first1, __last1, __first2, __last2, __p, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _BinaryPredicate,
class _IsVector>
bool
@@ -489,7 +489,7 @@ __pattern_equal(_ExecutionPolicy&&, _For
return __internal::__brick_equal(__first1, __last1, __first2, __p, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _BinaryPredicate,
class _IsVector>
bool
@@ -538,7 +538,7 @@ __pattern_find_if(_ExecutionPolicy&&, _F
return __internal::__brick_find_if(__first, __last, __pred, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _Predicate, class _IsVector>
_ForwardIterator
__pattern_find_if(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred,
@@ -681,7 +681,7 @@ __pattern_find_end(_ExecutionPolicy&&, _
return __internal::__brick_find_end(__first, __last, __s_first, __s_last, __pred, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate,
class _IsVector>
_ForwardIterator1
@@ -739,7 +739,7 @@ __pattern_find_first_of(_ExecutionPolicy
return __internal::__brick_find_first_of(__first, __last, __s_first, __s_last, __pred, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate,
class _IsVector>
_ForwardIterator1
@@ -787,7 +787,7 @@ __pattern_search(_ExecutionPolicy&&, _Fo
return __internal::__brick_search(__first, __last, __s_first, __s_last, __pred, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate,
class _IsVector>
_ForwardIterator1
@@ -846,7 +846,7 @@ __pattern_search_n(_ExecutionPolicy&&, _
return __internal::__brick_search_n(__first, __last, __count, __value, __pred, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _Size, class _Tp, class _BinaryPredicate,
class _IsVector>
_RandomAccessIterator
@@ -974,7 +974,7 @@ _OutputIterator
__brick_copy_if(_ForwardIterator __first, _ForwardIterator __last, _OutputIterator __result, _UnaryPredicate __pred,
/*vector=*/std::true_type) noexcept
{
-#if (__PSTL_MONOTONIC_PRESENT)
+#if (_PSTL_MONOTONIC_PRESENT)
return __unseq_backend::__simd_copy_if(__first, __last - __first, __result, __pred);
#else
return std::copy_if(__first, __last, __result, __pred);
@@ -1033,7 +1033,7 @@ void
__brick_copy_by_mask(_ForwardIterator __first, _ForwardIterator __last, _OutputIterator __result,
bool* __restrict __mask, _Assigner __assigner, /*vector=*/std::true_type) noexcept
{
-#if (__PSTL_MONOTONIC_PRESENT)
+#if (_PSTL_MONOTONIC_PRESENT)
__unseq_backend::__simd_copy_by_mask(__first, __last - __first, __result, __mask, __assigner);
#else
__internal::__brick_copy_by_mask(__first, __last, __result, __mask, __assigner, std::false_type());
@@ -1065,7 +1065,7 @@ void
__brick_partition_by_mask(_RandomAccessIterator __first, _RandomAccessIterator __last, _OutputIterator1 __out_true,
_OutputIterator2 __out_false, bool* __mask, /*vector=*/std::true_type) noexcept
{
-#if (__PSTL_MONOTONIC_PRESENT)
+#if (_PSTL_MONOTONIC_PRESENT)
__unseq_backend::__simd_partition_by_mask(__first, __last - __first, __out_true, __out_false, __mask);
#else
__internal::__brick_partition_by_mask(__first, __last, __out_true, __out_false, __mask, std::false_type());
@@ -1080,7 +1080,7 @@ __pattern_copy_if(_ExecutionPolicy&&, _F
return __internal::__brick_copy_if(__first, __last, __result, __pred, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator, class _UnaryPredicate,
class _IsVector>
_OutputIterator
@@ -1144,7 +1144,7 @@ __pattern_count(_ExecutionPolicy&&, _For
return __internal::__brick_count(__first, __last, __pred, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _Predicate, class _IsVector>
typename std::iterator_traits<_ForwardIterator>::difference_type
__pattern_count(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred,
@@ -1179,7 +1179,7 @@ _ForwardIterator
__brick_unique(_ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred,
/*is_vector=*/std::true_type) noexcept
{
- __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial");
+ _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial");
return std::unique(__first, __last, __pred);
}
@@ -1191,7 +1191,7 @@ __pattern_unique(_ExecutionPolicy&&, _Fo
return __internal::__brick_unique(__first, __last, __pred, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
// That function is shared between two algorithms - remove_if (__pattern_remove_if) and unique (pattern unique). But a mask calculation is different.
// So, a caller passes _CalcMask brick into remove_elements.
template <class _ExecutionPolicy, class _ForwardIterator, class _CalcMask, class _IsVector>
@@ -1272,7 +1272,7 @@ __remove_elements(_ExecutionPolicy&& __e
}
#endif
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _BinaryPredicate, class _IsVector>
_ForwardIterator
__pattern_unique(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred,
@@ -1317,7 +1317,7 @@ OutputIterator
__brick_unique_copy(_RandomAccessIterator __first, _RandomAccessIterator __last, OutputIterator __result,
_BinaryPredicate __pred, /*vector=*/std::true_type) noexcept
{
-#if (__PSTL_MONOTONIC_PRESENT)
+#if (_PSTL_MONOTONIC_PRESENT)
return __unseq_backend::__simd_unique_copy(__first, __last - __first, __result, __pred);
#else
return std::unique_copy(__first, __last, __result, __pred);
@@ -1355,7 +1355,7 @@ __brick_calc_mask_2(_RandomAccessIterato
return __unseq_backend::__simd_calc_mask_2(__first, __last - __first, __mask, __pred);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator, class _BinaryPredicate,
class _IsVector>
_OutputIterator
@@ -1468,7 +1468,7 @@ __pattern_reverse(_ExecutionPolicy&&, _B
__internal::__brick_reverse(__first, __last, _is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _BidirectionalIterator, class _IsVector>
void
__pattern_reverse(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __last,
@@ -1514,7 +1514,7 @@ __pattern_reverse_copy(_ExecutionPolicy&
return __internal::__brick_reverse_copy(__first, __last, __d_first, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _BidirectionalIterator, class _OutputIterator, class _IsVector>
_OutputIterator
__pattern_reverse_copy(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __last,
@@ -1540,7 +1540,7 @@ _ForwardIterator
__brick_rotate(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last,
/*is_vector=*/std::false_type) noexcept
{
-#if __PSTL_CPP11_STD_ROTATE_BROKEN
+#if _PSTL_CPP11_STD_ROTATE_BROKEN
std::rotate(__first, __middle, __last);
return std::next(__first, std::distance(__middle, __last));
#else
@@ -1597,7 +1597,7 @@ __pattern_rotate(_ExecutionPolicy&&, _Fo
return __internal::__brick_rotate(__first, __middle, __last, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _IsVector>
_ForwardIterator
__pattern_rotate(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __middle,
@@ -1690,7 +1690,7 @@ __pattern_rotate_copy(_ExecutionPolicy&&
return __internal::__brick_rotate_copy(__first, __middle, __last, __result, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _OutputIterator, class _IsVector>
_OutputIterator
__pattern_rotate_copy(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __middle,
@@ -1769,7 +1769,7 @@ __pattern_is_partitioned(_ExecutionPolic
return __internal::__brick_is_partitioned(__first, __last, __pred, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _UnaryPredicate, class _IsVector>
bool
__pattern_is_partitioned(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last,
@@ -1885,7 +1885,7 @@ _ForwardIterator
__brick_partition(_ForwardIterator __first, _ForwardIterator __last, _UnaryPredicate __pred,
/*is_vector=*/std::true_type) noexcept
{
- __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial");
+ _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial");
return std::partition(__first, __last, __pred);
}
@@ -1897,7 +1897,7 @@ __pattern_partition(_ExecutionPolicy&&,
return __internal::__brick_partition(__first, __last, __pred, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _UnaryPredicate, class _IsVector>
_ForwardIterator
__pattern_partition(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last,
@@ -1984,7 +1984,7 @@ _BidirectionalIterator
__brick_stable_partition(_BidirectionalIterator __first, _BidirectionalIterator __last, _UnaryPredicate __pred,
/*__is_vector=*/std::true_type) noexcept
{
- __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial");
+ _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial");
return std::stable_partition(__first, __last, __pred);
}
@@ -1997,7 +1997,7 @@ __pattern_stable_partition(_ExecutionPol
return __internal::__brick_stable_partition(__first, __last, __pred, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _BidirectionalIterator, class _UnaryPredicate, class _IsVector>
_BidirectionalIterator
__pattern_stable_partition(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __last,
@@ -2068,7 +2068,7 @@ std::pair<_OutputIterator1, _OutputItera
__brick_partition_copy(_ForwardIterator __first, _ForwardIterator __last, _OutputIterator1 __out_true,
_OutputIterator2 __out_false, _UnaryPredicate __pred, /*is_vector=*/std::true_type) noexcept
{
-#if (__PSTL_MONOTONIC_PRESENT)
+#if (_PSTL_MONOTONIC_PRESENT)
return __unseq_backend::__simd_partition_copy(__first, __last - __first, __out_true, __out_false, __pred);
#else
return std::partition_copy(__first, __last, __out_true, __out_false, __pred);
@@ -2085,7 +2085,7 @@ __pattern_partition_copy(_ExecutionPolic
return __internal::__brick_partition_copy(__first, __last, __out_true, __out_false, __pred, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator1, class _OutputIterator2,
class _UnaryPredicate, class _IsVector>
std::pair<_OutputIterator1, _OutputIterator2>
@@ -2139,7 +2139,7 @@ __pattern_sort(_ExecutionPolicy&&, _Rand
std::sort(__first, __last, __comp);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector>
void
__pattern_sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp,
@@ -2166,7 +2166,7 @@ __pattern_stable_sort(_ExecutionPolicy&&
std::stable_sort(__first, __last, __comp);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector>
void
__pattern_stable_sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last,
@@ -2193,7 +2193,7 @@ __pattern_partial_sort(_ExecutionPolicy&
std::partial_sort(__first, __middle, __last, __comp);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector>
void
__pattern_partial_sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __middle,
@@ -2227,7 +2227,7 @@ __pattern_partial_sort_copy(_ExecutionPo
return std::partial_sort_copy(__first, __last, __d_first, __d_last, __comp);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _RandomAccessIterator, class _Compare, class _IsVector>
_RandomAccessIterator
__pattern_partial_sort_copy(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last,
@@ -2251,7 +2251,7 @@ __pattern_partial_sort_copy(_ExecutionPo
_ForwardIterator __j1 = __first + (__j - __d_first);
// 1. Copy elements from input to output
-# if !__PSTL_ICC_18_OMP_SIMD_BROKEN
+# if !_PSTL_ICC_18_OMP_SIMD_BROKEN
__internal::__brick_copy(__i1, __j1, __i, __is_vector);
# else
std::copy(__i1, __j1, __i);
@@ -2325,7 +2325,7 @@ __pattern_adjacent_find(_ExecutionPolicy
return __internal::__brick_adjacent_find(__first, __last, __pred, __is_vector, __or_semantic);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _BinaryPredicate, class _IsVector>
_RandomAccessIterator
__pattern_adjacent_find(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last,
@@ -2386,7 +2386,7 @@ __pattern_nth_element(_ExecutionPolicy&&
std::nth_element(__first, __nth, __last, __comp);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector>
void
__pattern_nth_element(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __nth,
@@ -2462,7 +2462,7 @@ __pattern_fill(_ExecutionPolicy&&, _Forw
__internal::__brick_fill(__first, __last, __value, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _Tp, class _IsVector>
_ForwardIterator
__pattern_fill(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __value,
@@ -2536,7 +2536,7 @@ __pattern_generate(_ExecutionPolicy&&, _
__internal::__brick_generate(__first, __last, __g, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _Generator, class _IsVector>
_ForwardIterator
__pattern_generate(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Generator __g,
@@ -2574,7 +2574,7 @@ __pattern_generate_n(_ExecutionPolicy&&,
return __internal::__brick_generate_n(__first, __count, __g, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _OutputIterator, class _Size, class _Generator, class _IsVector>
_OutputIterator
__pattern_generate_n(_ExecutionPolicy&& __exec, _OutputIterator __first, _Size __count, _Generator __g,
@@ -2604,7 +2604,7 @@ _RandomAccessIterator
__brick_remove_if(_RandomAccessIterator __first, _RandomAccessIterator __last, _UnaryPredicate __pred,
/* __is_vector = */ std::true_type) noexcept
{
-#if __PSTL_MONOTONIC_PRESENT
+#if _PSTL_MONOTONIC_PRESENT
return __unseq_backend::__simd_remove_if(__first, __last - __first, __pred);
#else
return std::remove_if(__first, __last, __pred);
@@ -2619,7 +2619,7 @@ __pattern_remove_if(_ExecutionPolicy&&,
return __internal::__brick_remove_if(__first, __last, __pred, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _UnaryPredicate, class _IsVector>
_ForwardIterator
__pattern_remove_if(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last,
@@ -2662,7 +2662,7 @@ __brick_merge(_ForwardIterator1 __first1
_ForwardIterator2 __last2, _OutputIterator __d_first, _Compare __comp,
/* __is_vector = */ std::true_type) noexcept
{
- __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial");
+ _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial");
return std::merge(__first1, __last1, __first2, __last2, __d_first, __comp);
}
@@ -2676,7 +2676,7 @@ __pattern_merge(_ExecutionPolicy&&, _For
return __internal::__brick_merge(__first1, __last1, __first2, __last2, __d_first, __comp, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _OutputIterator,
class _Compare, class _IsVector>
_OutputIterator
@@ -2710,7 +2710,7 @@ void
__brick_inplace_merge(_BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last,
_Compare __comp, /* __is_vector = */ std::true_type) noexcept
{
- __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial")
+ _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial")
std::inplace_merge(__first, __middle, __last, __comp);
}
@@ -2723,7 +2723,7 @@ __pattern_inplace_merge(_ExecutionPolicy
__internal::__brick_inplace_merge(__first, __middle, __last, __comp, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _BidirectionalIterator, class _Compare, class _IsVector>
void
__pattern_inplace_merge(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __middle,
@@ -2780,7 +2780,7 @@ __pattern_includes(_ExecutionPolicy&& __
return std::includes(__first1, __last1, __first2, __last2, __comp);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Compare, class _IsVector>
bool
__pattern_includes(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1,
@@ -2839,7 +2839,7 @@ __pattern_includes(_ExecutionPolicy&& __
constexpr auto __set_algo_cut_off = 1000;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator,
class _Compare, class _IsVector, class _SizeFunction, class _SetOP>
_OutputIterator
@@ -2930,7 +2930,7 @@ __parallel_set_op(_ExecutionPolicy&& __e
}
#endif
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
//a shared parallel pattern for '__pattern_set_union' and '__pattern_set_symmetric_difference'
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator,
class _Compare, class _SetUnionOp, class _IsVector>
@@ -3067,7 +3067,7 @@ __brick_set_union(_ForwardIterator1 __fi
_ForwardIterator2 __last2, _OutputIterator __result, _Compare __comp,
/*__is_vector=*/std::true_type) noexcept
{
- __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial");
+ _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial");
return std::set_union(__first1, __last1, __first2, __last2, __result, __comp);
}
@@ -3082,7 +3082,7 @@ __pattern_set_union(_ExecutionPolicy&&,
return __internal::__brick_set_union(__first1, __last1, __first2, __last2, __result, __comp, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator,
class _Compare, class _IsVector>
_OutputIterator
@@ -3127,7 +3127,7 @@ __brick_set_intersection(_ForwardIterato
_ForwardIterator2 __last2, _OutputIterator __result, _Compare __comp,
/*__is_vector=*/std::true_type) noexcept
{
- __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial");
+ _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial");
return std::set_intersection(__first1, __last1, __first2, __last2, __result, __comp);
}
@@ -3141,7 +3141,7 @@ __pattern_set_intersection(_ExecutionPol
return __internal::__brick_set_intersection(__first1, __last1, __first2, __last2, __result, __comp, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator,
class _Compare, class _IsVector>
_OutputIterator
@@ -3224,7 +3224,7 @@ __brick_set_difference(_ForwardIterator1
_ForwardIterator2 __last2, _OutputIterator __result, _Compare __comp,
/*__is_vector=*/std::true_type) noexcept
{
- __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial");
+ _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial");
return std::set_difference(__first1, __last1, __first2, __last2, __result, __comp);
}
@@ -3238,7 +3238,7 @@ __pattern_set_difference(_ExecutionPolic
return __internal::__brick_set_difference(__first1, __last1, __first2, __last2, __result, __comp, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator,
class _Compare, class _IsVector>
_OutputIterator
@@ -3320,7 +3320,7 @@ __brick_set_symmetric_difference(_Forwar
_ForwardIterator2 __last2, _OutputIterator __result, _Compare __comp,
/*__is_vector=*/std::true_type) noexcept
{
- __PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial");
+ _PSTL_PRAGMA_MESSAGE("Vectorized algorithm unimplemented, redirected to serial");
return std::set_symmetric_difference(__first1, __last1, __first2, __last2, __result, __comp);
}
@@ -3335,7 +3335,7 @@ __pattern_set_symmetric_difference(_Exec
__is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _OutputIterator,
class _Compare, class _IsVector>
_OutputIterator
@@ -3421,7 +3421,7 @@ __is_heap_until_local(_RandomAccessItera
[&__comp](_RandomAccessIterator __it, _DifferenceType __i) { return __comp(__it[(__i - 1) / 2], __it[__i]); });
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _Compare, class _IsVector>
_RandomAccessIterator
__pattern_is_heap_until(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last,
@@ -3458,7 +3458,7 @@ _ForwardIterator
__brick_min_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp,
/* __is_vector = */ std::true_type) noexcept
{
-#if __PSTL_UDR_PRESENT
+#if _PSTL_UDR_PRESENT
return __unseq_backend::__simd_min_element(__first, __last - __first, __comp);
#else
return std::min_element(__first, __last, __comp);
@@ -3473,7 +3473,7 @@ __pattern_min_element(_ExecutionPolicy&&
return __internal::__brick_min_element(__first, __last, __comp, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <typename _ExecutionPolicy, typename _RandomAccessIterator, typename _Compare, typename _IsVector>
_RandomAccessIterator
__pattern_min_element(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last,
@@ -3515,7 +3515,7 @@ std::pair<_ForwardIterator, _ForwardIter
__brick_minmax_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp,
/* __is_vector = */ std::true_type) noexcept
{
-#if __PSTL_UDR_PRESENT
+#if _PSTL_UDR_PRESENT
return __unseq_backend::__simd_minmax_element(__first, __last - __first, __comp);
#else
return std::minmax_element(__first, __last, __comp);
@@ -3530,7 +3530,7 @@ __pattern_minmax_element(_ExecutionPolic
return __internal::__brick_minmax_element(__first, __last, __comp, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <typename _ExecutionPolicy, typename _ForwardIterator, typename _Compare, typename _IsVector>
std::pair<_ForwardIterator, _ForwardIterator>
__pattern_minmax_element(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Compare __comp,
@@ -3567,7 +3567,7 @@ std::pair<_ForwardIterator1, _ForwardIte
__mismatch_serial(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2,
_ForwardIterator2 __last2, _BinaryPredicate __pred)
{
-#if __PSTL_CPP14_2RANGE_MISMATCH_EQUAL_PRESENT
+#if _PSTL_CPP14_2RANGE_MISMATCH_EQUAL_PRESENT
return std::mismatch(__first1, __last1, __first2, __last2, __pred);
#else
for (; __first1 != __last1 && __first2 != __last2 && __pred(*__first1, *__first2); ++__first1, ++__first2)
@@ -3603,7 +3603,7 @@ __pattern_mismatch(_ExecutionPolicy&&, _
return __internal::__brick_mismatch(__first1, __last1, __first2, __last2, __pred, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _Predicate,
class _IsVector>
std::pair<_RandomAccessIterator1, _RandomAccessIterator2>
@@ -3684,7 +3684,7 @@ __pattern_lexicographical_compare(_Execu
return __internal::__brick_lexicographical_compare(__first1, __last1, __first2, __last2, __comp, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _Compare, class _IsVector>
bool
__pattern_lexicographical_compare(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1,
@@ -3733,4 +3733,4 @@ __pattern_lexicographical_compare(_Execu
} // namespace __internal
} // namespace __pstl
-#endif /* __PSTL_algorithm_impl_H */
+#endif /* _PSTL_ALGORITHM_IMPL_H */
Modified: pstl/trunk/include/pstl/internal/execution_defs.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/execution_defs.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/execution_defs.h (original)
+++ pstl/trunk/include/pstl/internal/execution_defs.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_execution_policy_defs_H
-#define __PSTL_execution_policy_defs_H
+#ifndef _PSTL_EXECUTION_POLICY_DEFS_H
+#define _PSTL_EXECUTION_POLICY_DEFS_H
#include <type_traits>
@@ -41,7 +41,7 @@ class sequenced_policy
}
};
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
// 2.5, Parallel execution policy
class parallel_policy
{
@@ -110,7 +110,7 @@ class unsequenced_policy
// 2.8, Execution policy objects
constexpr sequenced_policy seq{};
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
constexpr parallel_policy par{};
constexpr parallel_unsequenced_policy par_unseq{};
#endif
@@ -126,7 +126,7 @@ template <>
struct is_execution_policy<__pstl::execution::sequenced_policy> : std::true_type
{
};
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <>
struct is_execution_policy<__pstl::execution::parallel_policy> : std::true_type
{
@@ -141,7 +141,7 @@ struct is_execution_policy<__pstl::execu
{
};
-#if __PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT
+#if _PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT
template <class T>
constexpr bool is_execution_policy_v = __pstl::execution::is_execution_policy<T>::value;
#endif
@@ -159,4 +159,4 @@ using __enable_if_execution_policy =
} // namespace __pstl
-#endif /* __PSTL_execution_policy_defs_H */
+#endif /* _PSTL_EXECUTION_POLICY_DEFS_H */
Modified: pstl/trunk/include/pstl/internal/execution_impl.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/execution_impl.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/execution_impl.h (original)
+++ pstl/trunk/include/pstl/internal/execution_impl.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_execution_impl_H
-#define __PSTL_execution_impl_H
+#ifndef _PSTL_EXECUTION_IMPL_H
+#define _PSTL_EXECUTION_IMPL_H
#include <iterator>
#include <type_traits>
@@ -87,7 +87,7 @@ struct __policy_traits<unsequenced_polic
typedef std::true_type allow_vector;
};
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <>
struct __policy_traits<parallel_policy>
{
@@ -160,4 +160,4 @@ struct __prefer_parallel_tag
} // namespace __internal
} // namespace __pstl
-#endif /* __PSTL_execution_impl_H */
+#endif /* _PSTL_EXECUTION_IMPL_H */
Modified: pstl/trunk/include/pstl/internal/glue_algorithm_defs.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/glue_algorithm_defs.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/glue_algorithm_defs.h (original)
+++ pstl/trunk/include/pstl/internal/glue_algorithm_defs.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_glue_algorithm_defs_H
-#define __PSTL_glue_algorithm_defs_H
+#ifndef _PSTL_GLUE_ALGORITHM_DEFS_H
+#define _PSTL_GLUE_ALGORITHM_DEFS_H
#include <functional>
#include <iterator>
@@ -549,4 +549,4 @@ lexicographical_compare(_ExecutionPolicy
_ForwardIterator2 __first2, _ForwardIterator2 __last2);
} // namespace std
-#endif /* __PSTL_glue_algorithm_defs_H */
+#endif /* _PSTL_GLUE_ALGORITHM_DEFS_H */
Modified: pstl/trunk/include/pstl/internal/glue_algorithm_impl.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/glue_algorithm_impl.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/glue_algorithm_impl.h (original)
+++ pstl/trunk/include/pstl/internal/glue_algorithm_impl.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_glue_algorithm_impl_H
-#define __PSTL_glue_algorithm_impl_H
+#ifndef _PSTL_GLUE_ALGORITHM_IMPL_H
+#define _PSTL_GLUE_ALGORITHM_IMPL_H
#include <functional>
@@ -1181,4 +1181,4 @@ lexicographical_compare(_ExecutionPolicy
} // namespace std
-#endif /* __PSTL_glue_algorithm_impl_H */
+#endif /* _PSTL_GLUE_ALGORITHM_IMPL_H */
Modified: pstl/trunk/include/pstl/internal/glue_execution_defs.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/glue_execution_defs.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/glue_execution_defs.h (original)
+++ pstl/trunk/include/pstl/internal/glue_execution_defs.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_glue_execution_defs_H
-#define __PSTL_glue_execution_defs_H
+#ifndef _PSTL_GLUE_EXECUTION_DEFS_H
+#define _PSTL_GLUE_EXECUTION_DEFS_H
#include <type_traits>
@@ -18,7 +18,7 @@ namespace std
{
// Type trait
using __pstl::execution::is_execution_policy;
-#if __PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT
+#if _PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT
# if __INTEL_COMPILER
template <class T>
constexpr bool is_execution_policy_v = is_execution_policy<T>::value;
@@ -31,13 +31,13 @@ namespace execution
{
// Standard C++ policy classes
using __pstl::execution::sequenced_policy;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
using __pstl::execution::parallel_policy;
using __pstl::execution::parallel_unsequenced_policy;
#endif
// Standard predefined policy instances
using __pstl::execution::seq;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
using __pstl::execution::par;
using __pstl::execution::par_unseq;
#endif
@@ -53,4 +53,4 @@ using __pstl::execution::unsequenced_pol
#include "numeric_impl.h"
#include "parallel_backend.h"
-#endif /* __PSTL_glue_execution_defs_H */
+#endif /* _PSTL_GLUE_EXECUTION_DEFS_H */
Modified: pstl/trunk/include/pstl/internal/glue_memory_defs.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/glue_memory_defs.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/glue_memory_defs.h (original)
+++ pstl/trunk/include/pstl/internal/glue_memory_defs.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_glue_memory_defs_H
-#define __PSTL_glue_memory_defs_H
+#ifndef _PSTL_GLUE_MEMORY_DEFS_H
+#define _PSTL_GLUE_MEMORY_DEFS_H
#include "execution_defs.h"
@@ -76,4 +76,4 @@ __pstl::__internal::__enable_if_executio
uninitialized_value_construct_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size __n);
} // namespace std
-#endif /* __PSTL_glue_memory_defs_H */
+#endif /* _PSTL_GLUE_MEMORY_DEFS_H */
Modified: pstl/trunk/include/pstl/internal/glue_memory_impl.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/glue_memory_impl.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/glue_memory_impl.h (original)
+++ pstl/trunk/include/pstl/internal/glue_memory_impl.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_glue_memory_impl_H
-#define __PSTL_glue_memory_impl_H
+#ifndef _PSTL_GLUE_MEMORY_IMPL_H
+#define _PSTL_GLUE_MEMORY_IMPL_H
#include "execution_defs.h"
#include "utils.h"
@@ -358,4 +358,4 @@ uninitialized_value_construct_n(_Executi
} // namespace std
-#endif /* __PSTL_glue_memory_imple_H */
+#endif /* _PSTL_GLUE_MEMORY_IMPL_H */
Modified: pstl/trunk/include/pstl/internal/glue_numeric_defs.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/glue_numeric_defs.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/glue_numeric_defs.h (original)
+++ pstl/trunk/include/pstl/internal/glue_numeric_defs.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_glue_numeric_defs_H
-#define __PSTL_glue_numeric_defs_H
+#ifndef _PSTL_GLUE_NUMERIC_DEFS_H
+#define _PSTL_GLUE_NUMERIC_DEFS_H
#include <iterator>
@@ -115,4 +115,4 @@ adjacent_difference(_ExecutionPolicy&& _
_ForwardIterator2 __d_first);
} // namespace std
-#endif /* __PSTL_glue_numeric_defs_H */
+#endif /* _PSTL_GLUE_NUMERIC_DEFS_H */
Modified: pstl/trunk/include/pstl/internal/glue_numeric_impl.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/glue_numeric_impl.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/glue_numeric_impl.h (original)
+++ pstl/trunk/include/pstl/internal/glue_numeric_impl.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_glue_numeric_impl_H
-#define __PSTL_glue_numeric_impl_H
+#ifndef _PSTL_GLUE_NUMERIC_IMPL_H
+#define _PSTL_GLUE_NUMERIC_IMPL_H
#include <functional>
@@ -222,4 +222,4 @@ adjacent_difference(_ExecutionPolicy&& _
} // namespace std
-#endif /* __PSTL_glue_numeric_impl_H_ */
+#endif /* _PSTL_GLUE_NUMERIC_IMPL_H_ */
Modified: pstl/trunk/include/pstl/internal/memory_impl.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/memory_impl.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/memory_impl.h (original)
+++ pstl/trunk/include/pstl/internal/memory_impl.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_memory_impl_H
-#define __PSTL_memory_impl_H
+#ifndef _PSTL_MEMORY_IMPL_H
+#define _PSTL_MEMORY_IMPL_H
#include <iterator>
@@ -53,4 +53,4 @@ __brick_uninitialized_move(_ForwardItera
} // namespace __internal
} // namespace __pstl
-#endif /* __PSTL_memory_impl_H */
+#endif /* _PSTL_MEMORY_IMPL_H */
Modified: pstl/trunk/include/pstl/internal/numeric_fwd.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/numeric_fwd.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/numeric_fwd.h (original)
+++ pstl/trunk/include/pstl/internal/numeric_fwd.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_numeric_fwd_H
-#define __PSTL_numeric_fwd_H
+#ifndef _PSTL_NUMERIC_FWD_H
+#define _PSTL_NUMERIC_FWD_H
#include <type_traits>
#include <utility>
@@ -39,7 +39,7 @@ __pattern_transform_reduce(_ExecutionPol
_BinaryOperation1, _BinaryOperation2, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _Tp,
class _BinaryOperation1, class _BinaryOperation2, class _IsVector>
_Tp
@@ -67,7 +67,7 @@ __pattern_transform_reduce(_ExecutionPol
_UnaryOperation, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _Tp, class _BinaryOperation, class _UnaryOperation,
class _IsVector>
_Tp
@@ -99,7 +99,7 @@ __pattern_transform_scan(_ExecutionPolic
_BinaryOperation, _Inclusive, _IsVector,
/*is_parallel=*/std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator, class _UnaryOperation, class _Tp,
class _BinaryOperation, class _Inclusive, class _IsVector>
typename std::enable_if<!std::is_floating_point<_Tp>::value, _OutputIterator>::type
@@ -107,7 +107,7 @@ __pattern_transform_scan(_ExecutionPolic
_UnaryOperation, _Tp, _BinaryOperation, _Inclusive, _IsVector, /*is_parallel=*/std::true_type);
#endif
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator, class _UnaryOperation, class _Tp,
class _BinaryOperation, class _Inclusive, class _IsVector>
typename std::enable_if<std::is_floating_point<_Tp>::value, _OutputIterator>::type
@@ -133,7 +133,7 @@ _OutputIterator
__pattern_adjacent_difference(_ExecutionPolicy&&, _ForwardIterator, _ForwardIterator, _OutputIterator, _BinaryOperation,
_IsVector, /*is_parallel*/ std::false_type) noexcept;
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _OutputIterator, class _BinaryOperation,
class _IsVector>
_OutputIterator
@@ -143,4 +143,4 @@ __pattern_adjacent_difference(_Execution
} // namespace __internal
} // namespace __pstl
-#endif /* __PSTL_numeric_fwd_H */
+#endif /* _PSTL_NUMERIC_FWD_H */
Modified: pstl/trunk/include/pstl/internal/numeric_impl.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/numeric_impl.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/numeric_impl.h (original)
+++ pstl/trunk/include/pstl/internal/numeric_impl.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_numeric_impl_H
-#define __PSTL_numeric_impl_H
+#ifndef _PSTL_NUMERIC_IMPL_H
+#define _PSTL_NUMERIC_IMPL_H
#include <iterator>
#include <type_traits>
@@ -18,7 +18,7 @@
#include "unseq_backend_simd.h"
#include "algorithm_fwd.h"
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
# include "parallel_backend.h"
#endif
@@ -63,7 +63,7 @@ __pattern_transform_reduce(_ExecutionPol
return __brick_transform_reduce(__first1, __last1, __first2, __init, __binary_op1, __binary_op2, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator1, class _RandomAccessIterator2, class _Tp,
class _BinaryOperation1, class _BinaryOperation2, class _IsVector>
_Tp
@@ -125,7 +125,7 @@ __pattern_transform_reduce(_ExecutionPol
return __internal::__brick_transform_reduce(__first, __last, __init, __binary_op, __unary_op, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator, class _Tp, class _BinaryOperation, class _UnaryOperation,
class _IsVector>
_Tp
@@ -160,7 +160,7 @@ __brick_transform_scan(_ForwardIterator
for (; __first != __last; ++__first, ++__result)
{
*__result = __init;
- __PSTL_PRAGMA_FORCEINLINE
+ _PSTL_PRAGMA_FORCEINLINE
__init = __binary_op(__init, __unary_op(*__first));
}
return std::make_pair(__result, __init);
@@ -175,7 +175,7 @@ __brick_transform_scan(_ForwardIterator
{
for (; __first != __last; ++__first, ++__result)
{
- __PSTL_PRAGMA_FORCEINLINE
+ _PSTL_PRAGMA_FORCEINLINE
__init = __binary_op(__init, __unary_op(*__first));
*__result = __init;
}
@@ -196,7 +196,7 @@ __brick_transform_scan(_ForwardIterator
_UnaryOperation __unary_op, _Tp __init, _BinaryOperation __binary_op, _Inclusive,
/*is_vector=*/std::true_type) noexcept
{
-#if (__PSTL_UDS_PRESENT)
+#if (_PSTL_UDS_PRESENT)
return __unseq_backend::__simd_scan(__first, __last - __first, __result, __unary_op, __init, __binary_op,
_Inclusive());
#else
@@ -229,7 +229,7 @@ __pattern_transform_scan(_ExecutionPolic
.first;
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator, class _UnaryOperation, class _Tp,
class _BinaryOperation, class _Inclusive, class _IsVector>
typename std::enable_if<!std::is_floating_point<_Tp>::value, _OutputIterator>::type
@@ -261,7 +261,7 @@ __pattern_transform_scan(_ExecutionPolic
}
#endif
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _RandomAccessIterator, class _OutputIterator, class _UnaryOperation, class _Tp,
class _BinaryOperation, class _Inclusive, class _IsVector>
typename std::enable_if<std::is_floating_point<_Tp>::value, _OutputIterator>::type
@@ -288,7 +288,7 @@ __pattern_transform_scan(_ExecutionPolic
[__result, &__binary_op](_DifferenceType __i, _DifferenceType __len, _Tp __initial) {
return *(std::transform(__result + __i, __result + __i + __len, __result + __i,
[&__initial, &__binary_op](const _Tp& __x) {
- __PSTL_PRAGMA_FORCEINLINE
+ _PSTL_PRAGMA_FORCEINLINE
return __binary_op(__initial, __x);
}) -
1);
@@ -338,7 +338,7 @@ __pattern_adjacent_difference(_Execution
return __internal::__brick_adjacent_difference(__first, __last, __d_first, __op, __is_vector);
}
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
template <class _ExecutionPolicy, class _ForwardIterator1, class _ForwardIterator2, class _BinaryOperation,
class _IsVector>
_ForwardIterator2
@@ -367,4 +367,4 @@ __pattern_adjacent_difference(_Execution
} // namespace __internal
} // namespace __pstl
-#endif /* __PSTL_numeric_impl_H */
+#endif /* _PSTL_NUMERIC_IMPL_H */
Modified: pstl/trunk/include/pstl/internal/parallel_backend.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/parallel_backend.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/parallel_backend.h (original)
+++ pstl/trunk/include/pstl/internal/parallel_backend.h Wed Apr 10 12:51:40 2019
@@ -7,13 +7,13 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_parallel_backend_H
-#define __PSTL_parallel_backend_H
+#ifndef _PSTL_PARALLEL_BACKEND_H
+#define _PSTL_PARALLEL_BACKEND_H
-#if __PSTL_PAR_BACKEND_TBB
+#if _PSTL_PAR_BACKEND_TBB
# include "parallel_backend_tbb.h"
#else
-__PSTL_PRAGMA_MESSAGE("Parallel backend was not specified");
+_PSTL_PRAGMA_MESSAGE("Parallel backend was not specified");
#endif
-#endif /* __PSTL_parallel_backend_H */
+#endif /* _PSTL_PARALLEL_BACKEND_H */
Modified: pstl/trunk/include/pstl/internal/parallel_backend_tbb.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/parallel_backend_tbb.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/parallel_backend_tbb.h (original)
+++ pstl/trunk/include/pstl/internal/parallel_backend_tbb.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_parallel_backend_tbb_H
-#define __PSTL_parallel_backend_tbb_H
+#ifndef _PSTL_PARALLEL_BACKEND_TBB_H
+#define _PSTL_PARALLEL_BACKEND_TBB_H
#include <cassert>
#include <algorithm>
@@ -432,7 +432,7 @@ class __merge_task : public tbb::task
}
};
-#define __PSTL_MERGE_CUT_OFF 2000
+#define _PSTL_MERGE_CUT_OFF 2000
template <typename _RandomAccessIterator1, typename _RandomAccessIterator2, typename _RandomAccessIterator3,
typename __M_Compare, typename _Cleanup, typename _LeafMerge>
@@ -444,7 +444,7 @@ __merge_task<_RandomAccessIterator1, _Ra
typedef typename std::iterator_traits<_RandomAccessIterator2>::difference_type _DifferenceType2;
typedef typename std::common_type<_DifferenceType1, _DifferenceType2>::type _SizeType;
const _SizeType __n = (_M_xe - _M_xs) + (_M_ye - _M_ys);
- const _SizeType __merge_cut_off = __PSTL_MERGE_CUT_OFF;
+ const _SizeType __merge_cut_off = _PSTL_MERGE_CUT_OFF;
if (__n <= __merge_cut_off)
{
_M_leaf_merge(_M_xs, _M_xe, _M_ys, _M_ye, _M_zs, _M_comp);
@@ -515,7 +515,7 @@ struct __binary_no_op
}
};
-#define __PSTL_STABLE_SORT_CUT_OFF 500
+#define _PSTL_STABLE_SORT_CUT_OFF 500
template <typename _RandomAccessIterator1, typename _RandomAccessIterator2, typename _Compare, typename _LeafSort>
tbb::task*
@@ -523,7 +523,7 @@ __stable_sort_task<_RandomAccessIterator
{
const _SizeType __n = _M_xe - _M_xs;
const _SizeType __nmerge = _M_nsort > 0 ? _M_nsort : __n;
- const _SizeType __sort_cut_off = __PSTL_STABLE_SORT_CUT_OFF;
+ const _SizeType __sort_cut_off = _PSTL_STABLE_SORT_CUT_OFF;
if (__n <= __sort_cut_off)
{
_M_leaf_sort(_M_xs, _M_xe, _M_comp);
@@ -595,7 +595,7 @@ __parallel_stable_sort(_ExecutionPolicy&
if (__nsort == 0)
__nsort = __n;
- const _DifferenceType __sort_cut_off = __PSTL_STABLE_SORT_CUT_OFF;
+ const _DifferenceType __sort_cut_off = _PSTL_STABLE_SORT_CUT_OFF;
if (__n > __sort_cut_off)
{
assert(__nsort > 0 && __nsort <= __n);
@@ -626,7 +626,7 @@ __parallel_merge(_ExecutionPolicy&&, _Ra
typedef typename std::iterator_traits<_RandomAccessIterator2>::difference_type _DifferenceType2;
typedef typename std::common_type<_DifferenceType1, _DifferenceType2>::type _SizeType;
const _SizeType __n = (__xe - __xs) + (__ye - __ys);
- const _SizeType __merge_cut_off = __PSTL_MERGE_CUT_OFF;
+ const _SizeType __merge_cut_off = _PSTL_MERGE_CUT_OFF;
if (__n <= __merge_cut_off)
{
// Fall back on serial merge
@@ -658,4 +658,4 @@ __parallel_invoke(_ExecutionPolicy&&, _F
} // namespace __par_backend
} // namespace __pstl
-#endif /* __PSTL_parallel_backend_tbb_H */
+#endif /* _PSTL_PARALLEL_BACKEND_TBB_H */
Modified: pstl/trunk/include/pstl/internal/parallel_backend_utils.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/parallel_backend_utils.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/parallel_backend_utils.h (original)
+++ pstl/trunk/include/pstl/internal/parallel_backend_utils.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_parallel_backend_utils_H
-#define __PSTL_parallel_backend_utils_H
+#ifndef _PSTL_PARALLEL_BACKEND_UTILS_H
+#define _PSTL_PARALLEL_BACKEND_UTILS_H
#include <iterator>
#include <utility>
@@ -193,4 +193,4 @@ class __stack
} // namespace __par_backend
} // namespace __pstl
-#endif /* __PSTL_parallel_backend_utils_H */
+#endif /* _PSTL_PARALLEL_BACKEND_UTILS_H */
Modified: pstl/trunk/include/pstl/internal/parallel_impl.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/parallel_impl.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/parallel_impl.h (original)
+++ pstl/trunk/include/pstl/internal/parallel_impl.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_parallel_impl_H
-#define __PSTL_parallel_impl_H
+#ifndef _PSTL_PARALLEL_IMPL_H
+#define _PSTL_PARALLEL_IMPL_H
#include <atomic>
// This header defines the minimum set of parallel routines required to support Parallel STL,
@@ -78,4 +78,4 @@ __parallel_or(_ExecutionPolicy&& __exec,
} // namespace __internal
} // namespace __pstl
-#endif /* __PSTL_parallel_impl_H */
+#endif /* _PSTL_PARALLEL_IMPL_H */
Modified: pstl/trunk/include/pstl/internal/pstl_config.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/pstl_config.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/pstl_config.h (original)
+++ pstl/trunk/include/pstl/internal/pstl_config.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_config_H
-#define __PSTL_config_H
+#ifndef _PSTL_CONFIG_H
+#define _PSTL_CONFIG_H
#define PSTL_VERSION 203
#define PSTL_VERSION_MAJOR (PSTL_VERSION / 100)
@@ -16,115 +16,115 @@
// Check the user-defined macro for parallel policies
#if defined(PSTL_USE_PARALLEL_POLICIES)
-# undef __PSTL_USE_PAR_POLICIES
-# define __PSTL_USE_PAR_POLICIES PSTL_USE_PARALLEL_POLICIES
+# undef _PSTL_USE_PAR_POLICIES
+# define _PSTL_USE_PAR_POLICIES PSTL_USE_PARALLEL_POLICIES
// Check the internal macro for parallel policies
-#elif !defined(__PSTL_USE_PAR_POLICIES)
-# define __PSTL_USE_PAR_POLICIES 1
+#elif !defined(_PSTL_USE_PAR_POLICIES)
+# define _PSTL_USE_PAR_POLICIES 1
#endif
-#if __PSTL_USE_PAR_POLICIES
-# if !defined(__PSTL_PAR_BACKEND_TBB)
-# define __PSTL_PAR_BACKEND_TBB 1
+#if _PSTL_USE_PAR_POLICIES
+# if !defined(_PSTL_PAR_BACKEND_TBB)
+# define _PSTL_PAR_BACKEND_TBB 1
# endif
#else
-# undef __PSTL_PAR_BACKEND_TBB
+# undef _PSTL_PAR_BACKEND_TBB
#endif
// Check the user-defined macro for warnings
#if defined(PSTL_USAGE_WARNINGS)
-# undef __PSTL_USAGE_WARNINGS
-# define __PSTL_USAGE_WARNINGS PSTL_USAGE_WARNINGS
+# undef _PSTL_USAGE_WARNINGS
+# define _PSTL_USAGE_WARNINGS PSTL_USAGE_WARNINGS
// Check the internal macro for warnings
-#elif !defined(__PSTL_USAGE_WARNINGS)
-# define __PSTL_USAGE_WARNINGS 0
+#elif !defined(_PSTL_USAGE_WARNINGS)
+# define _PSTL_USAGE_WARNINGS 0
#endif
// Portability "#pragma" definition
#ifdef _MSC_VER
-# define __PSTL_PRAGMA(x) __pragma(x)
+# define _PSTL_PRAGMA(x) __pragma(x)
#else
-# define __PSTL_PRAGMA(x) _Pragma(# x)
+# define _PSTL_PRAGMA(x) _Pragma(# x)
#endif
-#define __PSTL_STRING_AUX(x) #x
-#define __PSTL_STRING(x) __PSTL_STRING_AUX(x)
-#define __PSTL_STRING_CONCAT(x, y) x #y
+#define _PSTL_STRING_AUX(x) #x
+#define _PSTL_STRING(x) _PSTL_STRING_AUX(x)
+#define _PSTL_STRING_CONCAT(x, y) x #y
-// note that when ICC or Clang is in use, __PSTL_GCC_VERSION might not fully match
+// note that when ICC or Clang is in use, _PSTL_GCC_VERSION might not fully match
// the actual GCC version on the system.
-#define __PSTL_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+#define _PSTL_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
#if __clang__
// according to clang documentation, version can be vendor specific
-# define __PSTL_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
+# define _PSTL_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
#endif
// Enable SIMD for compilers that support OpenMP 4.0
-#if (_OPENMP >= 201307) || (__INTEL_COMPILER >= 1600) || (!defined(__INTEL_COMPILER) && __PSTL_GCC_VERSION >= 40900)
-# define __PSTL_PRAGMA_SIMD __PSTL_PRAGMA(omp simd)
-# define __PSTL_PRAGMA_DECLARE_SIMD __PSTL_PRAGMA(omp declare simd)
-# define __PSTL_PRAGMA_SIMD_REDUCTION(PRM) __PSTL_PRAGMA(omp simd reduction(PRM))
+#if (_OPENMP >= 201307) || (__INTEL_COMPILER >= 1600) || (!defined(__INTEL_COMPILER) && _PSTL_GCC_VERSION >= 40900)
+# define _PSTL_PRAGMA_SIMD _PSTL_PRAGMA(omp simd)
+# define _PSTL_PRAGMA_DECLARE_SIMD _PSTL_PRAGMA(omp declare simd)
+# define _PSTL_PRAGMA_SIMD_REDUCTION(PRM) _PSTL_PRAGMA(omp simd reduction(PRM))
#elif !defined(_MSC_VER) //#pragma simd
-# define __PSTL_PRAGMA_SIMD __PSTL_PRAGMA(simd)
-# define __PSTL_PRAGMA_DECLARE_SIMD
-# define __PSTL_PRAGMA_SIMD_REDUCTION(PRM) __PSTL_PRAGMA(simd reduction(PRM))
+# define _PSTL_PRAGMA_SIMD _PSTL_PRAGMA(simd)
+# define _PSTL_PRAGMA_DECLARE_SIMD
+# define _PSTL_PRAGMA_SIMD_REDUCTION(PRM) _PSTL_PRAGMA(simd reduction(PRM))
#else //no simd
-# define __PSTL_PRAGMA_SIMD
-# define __PSTL_PRAGMA_DECLARE_SIMD
-# define __PSTL_PRAGMA_SIMD_REDUCTION(PRM)
+# define _PSTL_PRAGMA_SIMD
+# define _PSTL_PRAGMA_DECLARE_SIMD
+# define _PSTL_PRAGMA_SIMD_REDUCTION(PRM)
#endif //Enable SIMD
#if (__INTEL_COMPILER)
-# define __PSTL_PRAGMA_FORCEINLINE __PSTL_PRAGMA(forceinline)
+# define _PSTL_PRAGMA_FORCEINLINE _PSTL_PRAGMA(forceinline)
#else
-# define __PSTL_PRAGMA_FORCEINLINE
+# define _PSTL_PRAGMA_FORCEINLINE
#endif
#if (__INTEL_COMPILER >= 1900)
-# define __PSTL_PRAGMA_SIMD_SCAN(PRM) __PSTL_PRAGMA(omp simd reduction(inscan, PRM))
-# define __PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM) __PSTL_PRAGMA(omp scan inclusive(PRM))
-# define __PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM) __PSTL_PRAGMA(omp scan exclusive(PRM))
-#else
-# define __PSTL_PRAGMA_SIMD_SCAN(PRM)
-# define __PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM)
-# define __PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM)
+# define _PSTL_PRAGMA_SIMD_SCAN(PRM) _PSTL_PRAGMA(omp simd reduction(inscan, PRM))
+# define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM) _PSTL_PRAGMA(omp scan inclusive(PRM))
+# define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM) _PSTL_PRAGMA(omp scan exclusive(PRM))
+#else
+# define _PSTL_PRAGMA_SIMD_SCAN(PRM)
+# define _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(PRM)
+# define _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(PRM)
#endif
// Should be defined to 1 for environments with a vendor implementation of C++17 execution policies
-#define __PSTL_CPP17_EXECUTION_POLICIES_PRESENT (_MSC_VER >= 1912)
+#define _PSTL_CPP17_EXECUTION_POLICIES_PRESENT (_MSC_VER >= 1912)
-#define __PSTL_CPP14_2RANGE_MISMATCH_EQUAL_PRESENT \
+#define _PSTL_CPP14_2RANGE_MISMATCH_EQUAL_PRESENT \
(_MSC_VER >= 1900 || __cplusplus >= 201300L || __cpp_lib_robust_nonmodifying_seq_ops == 201304)
-#define __PSTL_CPP14_MAKE_REVERSE_ITERATOR_PRESENT \
+#define _PSTL_CPP14_MAKE_REVERSE_ITERATOR_PRESENT \
(_MSC_VER >= 1900 || __cplusplus >= 201402L || __cpp_lib_make_reverse_iterator == 201402)
-#define __PSTL_CPP14_INTEGER_SEQUENCE_PRESENT (_MSC_VER >= 1900 || __cplusplus >= 201402L)
-#define __PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT \
+#define _PSTL_CPP14_INTEGER_SEQUENCE_PRESENT (_MSC_VER >= 1900 || __cplusplus >= 201402L)
+#define _PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT \
(!__INTEL_COMPILER || __INTEL_COMPILER >= 1700) && (_MSC_FULL_VER >= 190023918 || __cplusplus >= 201402L)
-#define __PSTL_EARLYEXIT_PRESENT (__INTEL_COMPILER >= 1800)
-#define __PSTL_MONOTONIC_PRESENT (__INTEL_COMPILER >= 1800)
+#define _PSTL_EARLYEXIT_PRESENT (__INTEL_COMPILER >= 1800)
+#define _PSTL_MONOTONIC_PRESENT (__INTEL_COMPILER >= 1800)
-#if (__INTEL_COMPILER >= 1900 || !defined(__INTEL_COMPILER) && __PSTL_GCC_VERSION >= 40900 || _OPENMP >= 201307)
-# define __PSTL_UDR_PRESENT 1
+#if (__INTEL_COMPILER >= 1900 || !defined(__INTEL_COMPILER) && _PSTL_GCC_VERSION >= 40900 || _OPENMP >= 201307)
+# define _PSTL_UDR_PRESENT 1
#else
-# define __PSTL_UDR_PRESENT 0
+# define _PSTL_UDR_PRESENT 0
#endif
-#define __PSTL_UDS_PRESENT (__INTEL_COMPILER >= 1900 && __INTEL_COMPILER_BUILD_DATE >= 20180626)
+#define _PSTL_UDS_PRESENT (__INTEL_COMPILER >= 1900 && __INTEL_COMPILER_BUILD_DATE >= 20180626)
-#if __PSTL_EARLYEXIT_PRESENT
-# define __PSTL_PRAGMA_SIMD_EARLYEXIT __PSTL_PRAGMA(omp simd early_exit)
+#if _PSTL_EARLYEXIT_PRESENT
+# define _PSTL_PRAGMA_SIMD_EARLYEXIT _PSTL_PRAGMA(omp simd early_exit)
#else
-# define __PSTL_PRAGMA_SIMD_EARLYEXIT
+# define _PSTL_PRAGMA_SIMD_EARLYEXIT
#endif
-#if __PSTL_MONOTONIC_PRESENT
-# define __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(PRM) __PSTL_PRAGMA(omp ordered simd monotonic(PRM))
-# define __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(PRM1, PRM2) __PSTL_PRAGMA(omp ordered simd monotonic(PRM1, PRM2))
+#if _PSTL_MONOTONIC_PRESENT
+# define _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(PRM) _PSTL_PRAGMA(omp ordered simd monotonic(PRM))
+# define _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(PRM1, PRM2) _PSTL_PRAGMA(omp ordered simd monotonic(PRM1, PRM2))
#else
-# define __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(PRM)
-# define __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(PRM1, PRM2)
+# define _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(PRM)
+# define _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(PRM1, PRM2)
#endif
// Declaration of reduction functor, where
@@ -134,41 +134,41 @@
// omp_out - refers to the final value of the combiner operator
// omp_priv - refers to the private copy of the initial value
// omp_orig - refers to the original variable to be reduced
-#define __PSTL_PRAGMA_DECLARE_REDUCTION(NAME, OP) \
- __PSTL_PRAGMA(omp declare reduction(NAME:OP : omp_out(omp_in)) initializer(omp_priv = omp_orig))
+#define _PSTL_PRAGMA_DECLARE_REDUCTION(NAME, OP) \
+ _PSTL_PRAGMA(omp declare reduction(NAME:OP : omp_out(omp_in)) initializer(omp_priv = omp_orig))
#if (__INTEL_COMPILER >= 1600)
-# define __PSTL_PRAGMA_VECTOR_UNALIGNED __PSTL_PRAGMA(vector unaligned)
+# define _PSTL_PRAGMA_VECTOR_UNALIGNED _PSTL_PRAGMA(vector unaligned)
#else
-# define __PSTL_PRAGMA_VECTOR_UNALIGNED
+# define _PSTL_PRAGMA_VECTOR_UNALIGNED
#endif
// Check the user-defined macro to use non-temporal stores
#if defined(PSTL_USE_NONTEMPORAL_STORES) && (__INTEL_COMPILER >= 1600)
-# define __PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED __PSTL_PRAGMA(vector nontemporal)
+# define _PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED _PSTL_PRAGMA(vector nontemporal)
#else
-# define __PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED
+# define _PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED
#endif
#if _MSC_VER || __INTEL_COMPILER //the preprocessors don't type a message location
-# define __PSTL_PRAGMA_LOCATION __FILE__ ":" __PSTL_STRING(__LINE__) ": [Parallel STL message]: "
+# define _PSTL_PRAGMA_LOCATION __FILE__ ":" _PSTL_STRING(__LINE__) ": [Parallel STL message]: "
#else
-# define __PSTL_PRAGMA_LOCATION " [Parallel STL message]: "
+# define _PSTL_PRAGMA_LOCATION " [Parallel STL message]: "
#endif
-#define __PSTL_PRAGMA_MESSAGE_IMPL(x) __PSTL_PRAGMA(message(__PSTL_STRING_CONCAT(__PSTL_PRAGMA_LOCATION, x)))
+#define _PSTL_PRAGMA_MESSAGE_IMPL(x) _PSTL_PRAGMA(message(_PSTL_STRING_CONCAT(_PSTL_PRAGMA_LOCATION, x)))
-#if __PSTL_USAGE_WARNINGS
-# define __PSTL_PRAGMA_MESSAGE(x) __PSTL_PRAGMA_MESSAGE_IMPL(x)
-# define __PSTL_PRAGMA_MESSAGE_POLICIES(x) __PSTL_PRAGMA_MESSAGE_IMPL(x)
+#if _PSTL_USAGE_WARNINGS
+# define _PSTL_PRAGMA_MESSAGE(x) _PSTL_PRAGMA_MESSAGE_IMPL(x)
+# define _PSTL_PRAGMA_MESSAGE_POLICIES(x) _PSTL_PRAGMA_MESSAGE_IMPL(x)
#else
-# define __PSTL_PRAGMA_MESSAGE(x)
-# define __PSTL_PRAGMA_MESSAGE_POLICIES(x)
+# define _PSTL_PRAGMA_MESSAGE(x)
+# define _PSTL_PRAGMA_MESSAGE_POLICIES(x)
#endif
// broken macros
-#define __PSTL_CPP11_STD_ROTATE_BROKEN ((__GLIBCXX__ && __GLIBCXX__ < 20150716) || (_MSC_VER && _MSC_VER < 1800))
+#define _PSTL_CPP11_STD_ROTATE_BROKEN ((__GLIBCXX__ && __GLIBCXX__ < 20150716) || (_MSC_VER && _MSC_VER < 1800))
-#define __PSTL_ICC_18_OMP_SIMD_BROKEN (__INTEL_COMPILER == 1800)
+#define _PSTL_ICC_18_OMP_SIMD_BROKEN (__INTEL_COMPILER == 1800)
-#endif /* __PSTL_config_H */
+#endif /* _PSTL_CONFIG_H */
Modified: pstl/trunk/include/pstl/internal/unseq_backend_simd.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/unseq_backend_simd.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/unseq_backend_simd.h (original)
+++ pstl/trunk/include/pstl/internal/unseq_backend_simd.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_unseq_backend_simd_H
-#define __PSTL_unseq_backend_simd_H
+#ifndef _PSTL_UNSEQ_BACKEND_SIMD_H
+#define _PSTL_UNSEQ_BACKEND_SIMD_H
#include <type_traits>
@@ -28,7 +28,7 @@ template <class _Iterator, class _Differ
_Iterator
__simd_walk_1(_Iterator __first, _DifferenceType __n, _Function __f) noexcept
{
- __PSTL_PRAGMA_SIMD
+ _PSTL_PRAGMA_SIMD
for (_DifferenceType __i = 0; __i < __n; ++__i)
__f(__first[__i]);
@@ -39,7 +39,7 @@ template <class _Iterator1, class _Diffe
_Iterator2
__simd_walk_2(_Iterator1 __first1, _DifferenceType __n, _Iterator2 __first2, _Function __f) noexcept
{
- __PSTL_PRAGMA_SIMD
+ _PSTL_PRAGMA_SIMD
for (_DifferenceType __i = 0; __i < __n; ++__i)
__f(__first1[__i], __first2[__i]);
return __first2 + __n;
@@ -50,7 +50,7 @@ _Iterator3
__simd_walk_3(_Iterator1 __first1, _DifferenceType __n, _Iterator2 __first2, _Iterator3 __first3,
_Function __f) noexcept
{
- __PSTL_PRAGMA_SIMD
+ _PSTL_PRAGMA_SIMD
for (_DifferenceType __i = 0; __i < __n; ++__i)
__f(__first1[__i], __first2[__i], __first3[__i]);
return __first3 + __n;
@@ -61,10 +61,10 @@ template <class _Index, class _Differenc
bool
__simd_or(_Index __first, _DifferenceType __n, _Pred __pred) noexcept
{
-#if __PSTL_EARLYEXIT_PRESENT
+#if _PSTL_EARLYEXIT_PRESENT
_DifferenceType __i;
- __PSTL_PRAGMA_VECTOR_UNALIGNED
- __PSTL_PRAGMA_SIMD_EARLYEXIT
+ _PSTL_PRAGMA_VECTOR_UNALIGNED
+ _PSTL_PRAGMA_SIMD_EARLYEXIT
for (__i = 0; __i < __n; ++__i)
if (__pred(__first[__i]))
break;
@@ -75,7 +75,7 @@ __simd_or(_Index __first, _DifferenceTyp
while (__last != __first)
{
int32_t __flag = 1;
- __PSTL_PRAGMA_SIMD_REDUCTION(& : __flag)
+ _PSTL_PRAGMA_SIMD_REDUCTION(& : __flag)
for (_DifferenceType __i = 0; __i < __block_size; ++__i)
if (__pred(*(__first + __i)))
__flag = 0;
@@ -101,10 +101,10 @@ template <class _Index, class _Differenc
_Index
__simd_first(_Index __first, _DifferenceType __begin, _DifferenceType __end, _Compare __comp) noexcept
{
-#if __PSTL_EARLYEXIT_PRESENT
+#if _PSTL_EARLYEXIT_PRESENT
_DifferenceType __i = __begin;
- __PSTL_PRAGMA_VECTOR_UNALIGNED // Do not generate peel loop part
- __PSTL_PRAGMA_SIMD_EARLYEXIT for (; __i < __end; ++__i)
+ _PSTL_PRAGMA_VECTOR_UNALIGNED // Do not generate peel loop part
+ _PSTL_PRAGMA_SIMD_EARLYEXIT for (; __i < __end; ++__i)
{
if (__comp(__first, __i))
{
@@ -119,10 +119,10 @@ __simd_first(_Index __first, _Difference
while (__end - __begin >= __block_size)
{
_DifferenceType __found = 0;
- __PSTL_PRAGMA_VECTOR_UNALIGNED // Do not generate peel loop part
- __PSTL_PRAGMA_SIMD_REDUCTION(|
- : __found) for (_DifferenceType __i = __begin; __i < __begin + __block_size;
- ++__i)
+ _PSTL_PRAGMA_VECTOR_UNALIGNED // Do not generate peel loop part
+ _PSTL_PRAGMA_SIMD_REDUCTION(|
+ : __found) for (_DifferenceType __i = __begin; __i < __begin + __block_size;
+ ++__i)
{
const _DifferenceType __t = __comp(__first, __i);
__lane[__i - __begin] = __t;
@@ -154,17 +154,17 @@ __simd_first(_Index __first, _Difference
++__begin;
}
return __first + __end;
-#endif //__PSTL_EARLYEXIT_PRESENT
+#endif //_PSTL_EARLYEXIT_PRESENT
}
template <class _Index1, class _DifferenceType, class _Index2, class _Pred>
std::pair<_Index1, _Index2>
__simd_first(_Index1 __first1, _DifferenceType __n, _Index2 __first2, _Pred __pred) noexcept
{
-#if __PSTL_EARLYEXIT_PRESENT
+#if _PSTL_EARLYEXIT_PRESENT
_DifferenceType __i = 0;
- __PSTL_PRAGMA_VECTOR_UNALIGNED
- __PSTL_PRAGMA_SIMD_EARLYEXIT
+ _PSTL_PRAGMA_VECTOR_UNALIGNED
+ _PSTL_PRAGMA_SIMD_EARLYEXIT
for (; __i < __n; ++__i)
if (__pred(__first1[__i], __first2[__i]))
break;
@@ -179,9 +179,9 @@ __simd_first(_Index1 __first1, _Differen
{
_DifferenceType __found = 0;
_DifferenceType __i;
- __PSTL_PRAGMA_VECTOR_UNALIGNED // Do not generate peel loop part
- __PSTL_PRAGMA_SIMD_REDUCTION(|
- : __found) for (__i = 0; __i < __block_size; ++__i)
+ _PSTL_PRAGMA_VECTOR_UNALIGNED // Do not generate peel loop part
+ _PSTL_PRAGMA_SIMD_REDUCTION(|
+ : __found) for (__i = 0; __i < __block_size; ++__i)
{
const _DifferenceType __t = __pred(__first1[__i], __first2[__i]);
__lane[__i] = __t;
@@ -208,7 +208,7 @@ __simd_first(_Index1 __first1, _Differen
return std::make_pair(__first1, __first2);
return std::make_pair(__last1, __last2);
-#endif //__PSTL_EARLYEXIT_PRESENT
+#endif //_PSTL_EARLYEXIT_PRESENT
}
template <class _Index, class _DifferenceType, class _Pred>
@@ -216,7 +216,7 @@ _DifferenceType
__simd_count(_Index __index, _DifferenceType __n, _Pred __pred) noexcept
{
_DifferenceType __count = 0;
- __PSTL_PRAGMA_SIMD_REDUCTION(+ : __count)
+ _PSTL_PRAGMA_SIMD_REDUCTION(+ : __count)
for (_DifferenceType __i = 0; __i < __n; ++__i)
if (__pred(*(__index + __i)))
++__count;
@@ -235,10 +235,10 @@ __simd_unique_copy(_InputIterator __firs
_DifferenceType __cnt = 1;
__result[0] = __first[0];
- __PSTL_PRAGMA_SIMD
+ _PSTL_PRAGMA_SIMD
for (_DifferenceType __i = 1; __i < __n; ++__i)
{
- __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(__cnt : 1)
+ _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(__cnt : 1)
if (!__pred(__first[__i], __first[__i - 1]))
{
__result[__cnt] = __first[__i];
@@ -252,8 +252,8 @@ template <class _InputIterator, class _D
_OutputIterator
__simd_assign(_InputIterator __first, _DifferenceType __n, _OutputIterator __result, _Assigner __assigner) noexcept
{
- __PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED
- __PSTL_PRAGMA_SIMD
+ _PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED
+ _PSTL_PRAGMA_SIMD
for (_DifferenceType __i = 0; __i < __n; ++__i)
__assigner(__first + __i, __result + __i);
return __result + __n;
@@ -265,10 +265,10 @@ __simd_copy_if(_InputIterator __first, _
{
_DifferenceType __cnt = 0;
- __PSTL_PRAGMA_SIMD
+ _PSTL_PRAGMA_SIMD
for (_DifferenceType __i = 0; __i < __n; ++__i)
{
- __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(__cnt : 1)
+ _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(__cnt : 1)
if (__pred(__first[__i]))
{
__result[__cnt] = __first[__i];
@@ -284,7 +284,7 @@ __simd_calc_mask_2(_InputIterator __firs
{
_DifferenceType __count = 0;
- __PSTL_PRAGMA_SIMD_REDUCTION(+ : __count)
+ _PSTL_PRAGMA_SIMD_REDUCTION(+ : __count)
for (_DifferenceType __i = 0; __i < __n; ++__i)
{
__mask[__i] = !__pred(__first[__i], __first[__i - 1]);
@@ -299,7 +299,7 @@ __simd_calc_mask_1(_InputIterator __firs
{
_DifferenceType __count = 0;
- __PSTL_PRAGMA_SIMD_REDUCTION(+ : __count)
+ _PSTL_PRAGMA_SIMD_REDUCTION(+ : __count)
for (_DifferenceType __i = 0; __i < __n; ++__i)
{
__mask[__i] = __pred(__first[__i]);
@@ -314,12 +314,12 @@ __simd_copy_by_mask(_InputIterator __fir
_Assigner __assigner) noexcept
{
_DifferenceType __cnt = 0;
- __PSTL_PRAGMA_SIMD
+ _PSTL_PRAGMA_SIMD
for (_DifferenceType __i = 0; __i < __n; ++__i)
{
if (__mask[__i])
{
- __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(__cnt : 1)
+ _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(__cnt : 1)
{
__assigner(__first + __i, __result + __cnt);
++__cnt;
@@ -334,10 +334,10 @@ __simd_partition_by_mask(_InputIterator
_OutputIterator2 __out_false, bool* __mask) noexcept
{
_DifferenceType __cnt_true = 0, __cnt_false = 0;
- __PSTL_PRAGMA_SIMD
+ _PSTL_PRAGMA_SIMD
for (_DifferenceType __i = 0; __i < __n; ++__i)
{
- __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(__cnt_true : 1, __cnt_false : 1)
+ _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(__cnt_true : 1, __cnt_false : 1)
if (__mask[__i])
{
__out_true[__cnt_true] = __first[__i];
@@ -355,8 +355,8 @@ template <class _Index, class _Differenc
_Index
__simd_fill_n(_Index __first, _DifferenceType __n, const _Tp& __value) noexcept
{
- __PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED
- __PSTL_PRAGMA_SIMD
+ _PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED
+ _PSTL_PRAGMA_SIMD
for (_DifferenceType __i = 0; __i < __n; ++__i)
__first[__i] = __value;
return __first + __n;
@@ -366,8 +366,8 @@ template <class _Index, class _Differenc
_Index
__simd_generate_n(_Index __first, _DifferenceType __size, _Generator __g) noexcept
{
- __PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED
- __PSTL_PRAGMA_SIMD
+ _PSTL_USE_NONTEMPORAL_STORES_IF_ALLOWED
+ _PSTL_PRAGMA_SIMD
for (_DifferenceType __i = 0; __i < __size; ++__i)
__first[__i] = __g();
return __first + __size;
@@ -383,11 +383,11 @@ __simd_adjacent_find(_Index __first, _In
typedef typename std::iterator_traits<_Index>::difference_type _DifferenceType;
_DifferenceType __i = 0;
-#if __PSTL_EARLYEXIT_PRESENT
+#if _PSTL_EARLYEXIT_PRESENT
//Some compiler versions fail to compile the following loop when iterators are used. Indices are used instead
const _DifferenceType __n = __last - __first - 1;
- __PSTL_PRAGMA_VECTOR_UNALIGNED
- __PSTL_PRAGMA_SIMD_EARLYEXIT
+ _PSTL_PRAGMA_VECTOR_UNALIGNED
+ _PSTL_PRAGMA_SIMD_EARLYEXIT
for (; __i < __n; ++__i)
if (__pred(__first[__i], __first[__i + 1]))
break;
@@ -401,9 +401,9 @@ __simd_adjacent_find(_Index __first, _In
while (__last - __first >= __block_size)
{
_DifferenceType __found = 0;
- __PSTL_PRAGMA_VECTOR_UNALIGNED // Do not generate peel loop part
- __PSTL_PRAGMA_SIMD_REDUCTION(|
- : __found) for (__i = 0; __i < __block_size - 1; ++__i)
+ _PSTL_PRAGMA_VECTOR_UNALIGNED // Do not generate peel loop part
+ _PSTL_PRAGMA_SIMD_REDUCTION(|
+ : __found) for (__i = 0; __i < __block_size - 1; ++__i)
{
//TODO: to improve SIMD vectorization
const _DifferenceType __t = __pred(*(__first + __i), *(__first + __i + 1));
@@ -446,7 +446,7 @@ template <typename _DifferenceType, type
typename std::enable_if<is_arithmetic_plus<_Tp, _BinaryOperation>::value, _Tp>::type
__simd_transform_reduce(_DifferenceType __n, _Tp __init, _BinaryOperation, _UnaryOperation __f) noexcept
{
- __PSTL_PRAGMA_SIMD_REDUCTION(+ : __init)
+ _PSTL_PRAGMA_SIMD_REDUCTION(+ : __init)
for (_DifferenceType __i = 0; __i < __n; ++__i)
__init += __f(__i);
return __init;
@@ -463,7 +463,7 @@ __simd_transform_reduce(_Size __n, _Tp _
_Tp* __lane = reinterpret_cast<_Tp*>(__lane_);
// initializer
- __PSTL_PRAGMA_SIMD
+ _PSTL_PRAGMA_SIMD
for (_Size __i = 0; __i < __block_size; ++__i)
{
::new (__lane + __i) _Tp(__binary_op(__f(__i), __f(__block_size + __i)));
@@ -473,14 +473,14 @@ __simd_transform_reduce(_Size __n, _Tp _
const _Size last_iteration = __block_size * (__n / __block_size);
for (; __i < last_iteration; __i += __block_size)
{
- __PSTL_PRAGMA_SIMD
+ _PSTL_PRAGMA_SIMD
for (_Size __j = 0; __j < __block_size; ++__j)
{
__lane[__j] = __binary_op(__lane[__j], __f(__i + __j));
}
}
// remainder
- __PSTL_PRAGMA_SIMD
+ _PSTL_PRAGMA_SIMD
for (_Size __j = 0; __j < __n - last_iteration; ++__j)
{
__lane[__j] = __binary_op(__lane[__j], __f(last_iteration + __j));
@@ -491,7 +491,7 @@ __simd_transform_reduce(_Size __n, _Tp _
__init = __binary_op(__init, __lane[__i]);
}
// destroyer
- __PSTL_PRAGMA_SIMD
+ _PSTL_PRAGMA_SIMD
for (_Size __i = 0; __i < __block_size; ++__i)
{
__lane[__i].~_Tp();
@@ -514,11 +514,11 @@ typename std::enable_if<is_arithmetic_pl
__simd_scan(_InputIterator __first, _Size __n, _OutputIterator __result, _UnaryOperation __unary_op, _Tp __init,
_BinaryOperation, /*Inclusive*/ std::false_type)
{
- __PSTL_PRAGMA_SIMD_SCAN(+ : __init)
+ _PSTL_PRAGMA_SIMD_SCAN(+ : __init)
for (_Size __i = 0; __i < __n; ++__i)
{
__result[__i] = __init;
- __PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(__init)
+ _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(__init)
__init += __unary_op(__first[__i]);
}
return std::make_pair(__result + __n, __init);
@@ -552,14 +552,14 @@ __simd_scan(_InputIterator __first, _Siz
typedef _Combiner<_Tp, _BinaryOperation> _CombinerType;
_CombinerType __init_{__init, &__binary_op};
- __PSTL_PRAGMA_DECLARE_REDUCTION(__bin_op, _CombinerType)
+ _PSTL_PRAGMA_DECLARE_REDUCTION(__bin_op, _CombinerType)
- __PSTL_PRAGMA_SIMD_SCAN(__bin_op : __init_)
+ _PSTL_PRAGMA_SIMD_SCAN(__bin_op : __init_)
for (_Size __i = 0; __i < __n; ++__i)
{
__result[__i] = __init_.__value;
- __PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(__init_)
- __PSTL_PRAGMA_FORCEINLINE
+ _PSTL_PRAGMA_SIMD_EXCLUSIVE_SCAN(__init_)
+ _PSTL_PRAGMA_FORCEINLINE
__init_.__value = __binary_op(__init_.__value, __unary_op(__first[__i]));
}
return std::make_pair(__result + __n, __init_.__value);
@@ -572,11 +572,11 @@ typename std::enable_if<is_arithmetic_pl
__simd_scan(_InputIterator __first, _Size __n, _OutputIterator __result, _UnaryOperation __unary_op, _Tp __init,
_BinaryOperation, /*Inclusive*/ std::true_type)
{
- __PSTL_PRAGMA_SIMD_SCAN(+ : __init)
+ _PSTL_PRAGMA_SIMD_SCAN(+ : __init)
for (_Size __i = 0; __i < __n; ++__i)
{
__init += __unary_op(__first[__i]);
- __PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(__init)
+ _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(__init)
__result[__i] = __init;
}
return std::make_pair(__result + __n, __init);
@@ -592,14 +592,14 @@ __simd_scan(_InputIterator __first, _Siz
typedef _Combiner<_Tp, _BinaryOperation> _CombinerType;
_CombinerType __init_{__init, &__binary_op};
- __PSTL_PRAGMA_DECLARE_REDUCTION(__bin_op, _CombinerType)
+ _PSTL_PRAGMA_DECLARE_REDUCTION(__bin_op, _CombinerType)
- __PSTL_PRAGMA_SIMD_SCAN(__bin_op : __init_)
+ _PSTL_PRAGMA_SIMD_SCAN(__bin_op : __init_)
for (_Size __i = 0; __i < __n; ++__i)
{
- __PSTL_PRAGMA_FORCEINLINE
+ _PSTL_PRAGMA_FORCEINLINE
__init_.__value = __binary_op(__init_.__value, __unary_op(__first[__i]));
- __PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(__init_)
+ _PSTL_PRAGMA_SIMD_INCLUSIVE_SCAN(__init_)
__result[__i] = __init_.__value;
}
return std::make_pair(__result + __n, __init_.__value);
@@ -633,7 +633,7 @@ __simd_min_element(_ForwardIterator __fi
{
}
- __PSTL_PRAGMA_DECLARE_SIMD
+ _PSTL_PRAGMA_DECLARE_SIMD
void
operator()(const _ComplexType& __obj)
{
@@ -648,9 +648,9 @@ __simd_min_element(_ForwardIterator __fi
_ComplexType __init{*__first, &__comp};
- __PSTL_PRAGMA_DECLARE_REDUCTION(__min_func, _ComplexType)
+ _PSTL_PRAGMA_DECLARE_REDUCTION(__min_func, _ComplexType)
- __PSTL_PRAGMA_SIMD_REDUCTION(__min_func : __init)
+ _PSTL_PRAGMA_SIMD_REDUCTION(__min_func : __init)
for (_Size __i = 1; __i < __n; ++__i)
{
const _ValueType __min_val = __init.__min_val;
@@ -727,9 +727,9 @@ __simd_minmax_element(_ForwardIterator _
_ComplexType __init{*__first, *__first, &__comp};
- __PSTL_PRAGMA_DECLARE_REDUCTION(__min_func, _ComplexType);
+ _PSTL_PRAGMA_DECLARE_REDUCTION(__min_func, _ComplexType);
- __PSTL_PRAGMA_SIMD_REDUCTION(__min_func : __init)
+ _PSTL_PRAGMA_SIMD_REDUCTION(__min_func : __init)
for (_Size __i = 1; __i < __n; ++__i)
{
auto __min_val = __init.__min_val;
@@ -757,10 +757,10 @@ __simd_partition_copy(_InputIterator __f
{
_DifferenceType __cnt_true = 0, __cnt_false = 0;
- __PSTL_PRAGMA_SIMD
+ _PSTL_PRAGMA_SIMD
for (_DifferenceType __i = 0; __i < __n; ++__i)
{
- __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(__cnt_true : 1, __cnt_false : 1)
+ _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC_2ARGS(__cnt_true : 1, __cnt_false : 1)
if (__pred(__first[__i]))
{
__out_true[__cnt_true] = __first[__i];
@@ -838,10 +838,10 @@ __simd_remove_if(_RandomAccessIterator _
}
_DifferenceType __cnt = 0;
- __PSTL_PRAGMA_SIMD
+ _PSTL_PRAGMA_SIMD
for (_DifferenceType __i = 1; __i < __n; ++__i)
{
- __PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(__cnt : 1)
+ _PSTL_PRAGMA_SIMD_ORDERED_MONOTONIC(__cnt : 1)
if (!__pred(__current[__i]))
{
__current[__cnt] = std::move(__current[__i]);
@@ -853,4 +853,4 @@ __simd_remove_if(_RandomAccessIterator _
} // namespace __unseq_backend
} // namespace __pstl
-#endif /* __PSTL_unseq_backend_simd_H */
+#endif /* _PSTL_UNSEQ_BACKEND_SIMD_H */
Modified: pstl/trunk/include/pstl/internal/utils.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/internal/utils.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/internal/utils.h (original)
+++ pstl/trunk/include/pstl/internal/utils.h Wed Apr 10 12:51:40 2019
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_utils_H
-#define __PSTL_utils_H
+#ifndef _PSTL_UTILS_H
+#define _PSTL_UTILS_H
#include <new>
#include <iterator>
@@ -219,4 +219,4 @@ __cmp_iterators_by_values(_ForwardIterat
} // namespace __internal
} // namespace __pstl
-#endif /* __PSTL_utils_H */
+#endif /* _PSTL_UTILS_H */
Modified: pstl/trunk/include/pstl/memory
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/memory?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/memory (original)
+++ pstl/trunk/include/pstl/memory Wed Apr 10 12:51:40 2019
@@ -7,18 +7,18 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_memory
-#define __PSTL_memory
+#ifndef _PSTL_MEMORY
+#define _PSTL_MEMORY
#include "internal/pstl_config.h"
-#if __PSTL_EXECUTION_POLICIES_DEFINED
+#if _PSTL_EXECUTION_POLICIES_DEFINED
// If <execution> has already been included, pull in implementations
# include "internal/glue_memory_impl.h"
#else
// Otherwise just pull in forward declarations
# include "internal/glue_memory_defs.h"
-# define __PSTL_MEMORY_FORWARD_DECLARED 1
+# define _PSTL_MEMORY_FORWARD_DECLARED 1
#endif
-#endif /* __PSTL_memory */
+#endif /* _PSTL_MEMORY */
Modified: pstl/trunk/include/pstl/numeric
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/include/pstl/numeric?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/include/pstl/numeric (original)
+++ pstl/trunk/include/pstl/numeric Wed Apr 10 12:51:40 2019
@@ -7,18 +7,18 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_numeric
-#define __PSTL_numeric
+#ifndef _PSTL_NUMERIC
+#define _PSTL_NUMERIC
#include "internal/pstl_config.h"
-#if __PSTL_EXECUTION_POLICIES_DEFINED
+#if _PSTL_EXECUTION_POLICIES_DEFINED
// If <execution> has already been included, pull in implementations
# include "internal/glue_numeric_impl.h"
#else
// Otherwise just pull in forward declarations
# include "internal/glue_numeric_defs.h"
-# define __PSTL_NUMERIC_FORWARD_DECLARED 1
+# define _PSTL_NUMERIC_FORWARD_DECLARED 1
#endif
-#endif /* __PSTL_numeric */
+#endif /* _PSTL_NUMERIC */
Modified: pstl/trunk/test/std/algorithms/alg.merge/inplace_merge.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.merge/inplace_merge.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.merge/inplace_merge.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.merge/inplace_merge.pass.cpp Wed Apr 10 12:51:40 2019
@@ -25,8 +25,8 @@ using namespace TestUtils;
struct test_one_policy
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration
template <typename BiDirIt1, typename Size, typename Generator1, typename Generator2, typename Compare>
void
operator()(pstl::execution::unsequenced_policy, BiDirIt1 first1, BiDirIt1 last1, BiDirIt1 first2, BiDirIt1 last2,
Modified: pstl/trunk/test/std/algorithms/alg.merge/merge.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.merge/merge.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.merge/merge.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.merge/merge.pass.cpp Wed Apr 10 12:51:40 2019
@@ -107,7 +107,7 @@ main()
test_merge_by_type<int32_t>([](size_t v) { return (v % 2 == 0 ? v : -v) * 3; }, [](size_t v) { return v * 2; });
test_merge_by_type<float64_t>([](size_t v) { return float64_t(v); }, [](size_t v) { return float64_t(v - 100); });
-#if !__PSTL_ICC_16_17_TEST_64_TIMEOUT
+#if !_PSTL_ICC_16_17_TEST_64_TIMEOUT
test_merge_by_type<Wrapper<int16_t>>([](size_t v) { return Wrapper<int16_t>(v % 100); },
[](size_t v) { return Wrapper<int16_t>(v % 10); });
#endif
Modified: pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.copy/copy_if.pass.cpp Wed Apr 10 12:51:40 2019
@@ -24,7 +24,7 @@ using namespace TestUtils;
struct run_copy_if
{
-#if __PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN // dummy specializations to skip testing in case of broken configuration
+#if _PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN // dummy specializations to skip testing in case of broken configuration
template <typename InputIterator, typename OutputIterator, typename OutputIterator2, typename Size,
typename Predicate, typename T>
void
@@ -135,11 +135,11 @@ main()
test<int32_t>(-666, [](const int32_t& x) { return x != 42; },
[](size_t j) { return ((j + 1) % 5 & 2) != 0 ? int32_t(j + 1) : 42; });
-#if !__PSTL_ICC_17_TEST_MAC_RELEASE_32_BROKEN
+#if !_PSTL_ICC_17_TEST_MAC_RELEASE_32_BROKEN
test<Number>(Number(42, OddTag()), IsMultiple(3, OddTag()), [](int32_t j) { return Number(j, OddTag()); });
#endif
-#if !__PSTL_ICC_16_17_TEST_REDUCTION_RELEASE_BROKEN
+#if !_PSTL_ICC_16_17_TEST_REDUCTION_RELEASE_BROKEN
test<int32_t>(-666, [](const int32_t& x) { return true; }, [](size_t j) { return j; }, false);
#endif
Modified: pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp Wed Apr 10 12:51:40 2019
@@ -24,7 +24,7 @@ using namespace TestUtils;
struct test_one_policy
{
//dummy specialization by policy type, in case of broken configuration
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN
template <typename Iterator1, typename Predicate>
void
@@ -93,7 +93,7 @@ main()
test<float64_t>([](const float64_t x) { return x < 0; });
test<int32_t>([](const int32_t x) { return x > 1000; });
test<uint16_t>([](const uint16_t x) { return x % 5 < 3; });
-#if !__PSTL_ICC_18_TEST_EARLY_EXIT_MONOTONIC_RELEASE_BROKEN && !__PSTL_ICC_19_TEST_IS_PARTITIONED_RELEASE_BROKEN
+#if !_PSTL_ICC_18_TEST_EARLY_EXIT_MONOTONIC_RELEASE_BROKEN && !_PSTL_ICC_19_TEST_IS_PARTITIONED_RELEASE_BROKEN
test<LocalWrapper<float64_t>>([](const LocalWrapper<float64_t>& x) { return true; });
#endif
Modified: pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/partition.pass.cpp Wed Apr 10 12:51:40 2019
@@ -68,8 +68,8 @@ is_equal(Iterator first, Iterator last,
struct test_one_policy
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specializations to skip testing in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specializations to skip testing in case of broken configuration
template <typename BiDirIt, typename Size, typename UnaryOp, typename Generator>
void
operator()(pstl::execution::unsequenced_policy, BiDirIt first, BiDirIt last, BiDirIt exp_first, BiDirIt exp_last,
@@ -83,7 +83,7 @@ struct test_one_policy
BiDirIt exp_last, Size n, UnaryOp unary_op, Generator generator)
{
}
-#elif __PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN //dummy specializations to skip testing in case of broken configuration
+#elif _PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN //dummy specializations to skip testing in case of broken configuration
template <typename BiDirIt, typename Size, typename UnaryOp, typename Generator>
void
operator()(pstl::execution::parallel_policy, BiDirIt first, BiDirIt last, BiDirIt exp_first, BiDirIt exp_last,
@@ -168,7 +168,7 @@ struct test_non_const
int32_t
main()
{
-#if !__PSTL_ICC_16_17_TEST_REDUCTION_RELEASE_BROKEN
+#if !_PSTL_ICC_16_17_TEST_REDUCTION_RELEASE_BROKEN
test_by_type<int32_t>([](int32_t i) { return i; }, [](int32_t) { return true; });
#endif
test_by_type<float64_t>([](int32_t i) { return -i; }, [](const float64_t x) { return x < 0; });
Modified: pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp Wed Apr 10 12:51:40 2019
@@ -44,7 +44,7 @@ struct test_partition_copy
}
//dummy specialization by iterator type and policy type, in case of broken configuration
-#if __PSTL_ICC_1800_TEST_MONOTONIC_RELEASE_64_BROKEN
+#if _PSTL_ICC_1800_TEST_MONOTONIC_RELEASE_64_BROKEN
template <typename InputIterator, typename OutputIterator, typename OutputIterator2, typename UnaryOp>
void
operator()(pstl::execution::unsequenced_policy, std::reverse_iterator<InputIterator> first,
@@ -106,7 +106,7 @@ main()
{
test<int32_t>([](const int32_t value) { return value % 2; });
-#if !__PSTL_ICC_16_17_TEST_REDUCTION_RELEASE_BROKEN
+#if !_PSTL_ICC_16_17_TEST_REDUCTION_RELEASE_BROKEN
test<int32_t>([](const int32_t value) { return true; });
#endif
Modified: pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse.pass.cpp Wed Apr 10 12:51:40 2019
@@ -25,8 +25,8 @@ using namespace TestUtils;
struct test_one_policy
{
-#if __PSTL_ICC_18_VC141_TEST_SIMD_LAMBDA_RELEASE_BROKEN || __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_18_VC141_TEST_SIMD_LAMBDA_RELEASE_BROKEN || _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration
template <typename Iterator1, typename Iterator2>
typename std::enable_if<is_same_iterator_category<Iterator1, std::random_access_iterator_tag>::value, void>::type
operator()(pstl::execution::unsequenced_policy, Iterator1 data_b, Iterator1 data_e, Iterator2 actual_b,
@@ -99,7 +99,7 @@ main()
test<int32_t>();
test<uint16_t>();
test<float64_t>();
-#if !__PSTL_ICC_17_TEST_MAC_RELEASE_32_BROKEN
+#if !_PSTL_ICC_17_TEST_MAC_RELEASE_32_BROKEN
test<wrapper<float64_t>>();
#endif
Modified: pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp Wed Apr 10 12:51:40 2019
@@ -65,8 +65,8 @@ struct test_one_policy
Iterator data_e;
test_one_policy(Iterator b, Iterator e) : data_b(b), data_e(e) {}
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration
template <typename Iterator1>
typename std::enable_if<is_same_iterator_category<Iterator1, std::random_access_iterator_tag>::value, void>::type
operator()(pstl::execution::unsequenced_policy, Iterator1 actual_b, Iterator1 actual_e)
Modified: pstl/trunk/test/std/algorithms/alg.modifying.operations/copy_move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.modifying.operations/copy_move.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.modifying.operations/copy_move.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.modifying.operations/copy_move.pass.cpp Wed Apr 10 12:51:40 2019
@@ -26,8 +26,8 @@ using namespace TestUtils;
struct run_copy
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
template <typename InputIterator, typename OutputIterator, typename OutputIterator2, typename Size, typename T>
void
operator()(pstl::execution::unsequenced_policy, InputIterator first, InputIterator last, OutputIterator out_first,
@@ -79,8 +79,8 @@ template <typename T>
struct run_move
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
template <typename InputIterator, typename OutputIterator, typename OutputIterator2, typename Size>
void
operator()(pstl::execution::unsequenced_policy, InputIterator first, InputIterator last, OutputIterator out_first,
@@ -122,8 +122,8 @@ template <typename T>
struct run_move<Wrapper<T>>
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
template <typename InputIterator, typename OutputIterator, typename OutputIterator2, typename Size>
void
operator()(pstl::execution::unsequenced_policy, InputIterator first, InputIterator last, OutputIterator out_first,
@@ -195,7 +195,7 @@ main()
test<int32_t>(-666, [](size_t j) { return int32_t(j); });
test<Wrapper<float64_t>>(Wrapper<float64_t>(-666.0), [](int32_t j) { return Wrapper<float64_t>(j); });
-#if !__PSTL_ICC_16_17_TEST_64_TIMEOUT
+#if !_PSTL_ICC_16_17_TEST_64_TIMEOUT
test<float64_t>(-666.0, [](size_t j) { return float64_t(j); });
test<Number>(Number(42, OddTag()), [](int32_t j) { return Number(j, OddTag()); });
#endif
Modified: pstl/trunk/test/std/algorithms/alg.modifying.operations/remove.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.modifying.operations/remove.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.modifying.operations/remove.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.modifying.operations/remove.pass.cpp Wed Apr 10 12:51:40 2019
@@ -24,8 +24,8 @@ using namespace TestUtils;
struct run_remove
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
template <typename InputIterator, typename OutputIterator, typename Size, typename T>
void
operator()(pstl::execution::unsequenced_policy, InputIterator first, InputIterator last, OutputIterator out_first,
@@ -62,8 +62,8 @@ struct run_remove
struct run_remove_if
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
template <typename InputIterator, typename OutputIterator, typename Size, typename Predicate>
void
operator()(pstl::execution::unsequenced_policy, InputIterator first, InputIterator last, OutputIterator out_first,
@@ -136,7 +136,7 @@ struct test_non_const
int32_t
main()
{
-#if !__PSTL_ICC_18_TEST_EARLY_EXIT_MONOTONIC_RELEASE_BROKEN
+#if !_PSTL_ICC_18_TEST_EARLY_EXIT_MONOTONIC_RELEASE_BROKEN
test<int32_t>(666, 42, [](int32_t val) { return true; }, [](size_t j) { return j; });
#endif
@@ -145,7 +145,7 @@ main()
test<float64_t>(-666.0, 8.5, [](const float64_t& val) { return val != 8.5; },
[](size_t j) { return ((j + 1) % 7 & 2) != 0 ? 8.5 : float64_t(j % 32 + j); });
-#if !__PSTL_ICC_17_TEST_MAC_RELEASE_32_BROKEN
+#if !_PSTL_ICC_17_TEST_MAC_RELEASE_32_BROKEN
test<Number>(Number(-666, OddTag()), Number(42, OddTag()), IsMultiple(3, OddTag()),
[](int32_t j) { return Number(j, OddTag()); });
#endif
Modified: pstl/trunk/test/std/algorithms/alg.modifying.operations/replace_copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.modifying.operations/replace_copy.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.modifying.operations/replace_copy.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.modifying.operations/replace_copy.pass.cpp Wed Apr 10 12:51:40 2019
@@ -96,7 +96,7 @@ main()
test<int32_t>(-666, 42, 99, [](const int32_t& x) { return x != 42; },
[](size_t j) { return ((j + 1) % 5 & 2) != 0 ? 42 : -1 - int32_t(j); });
-#if !__PSTL_ICC_17_TEST_MAC_RELEASE_32_BROKEN
+#if !_PSTL_ICC_17_TEST_MAC_RELEASE_32_BROKEN
test<Number>(Number(42, OddTag()), Number(2001, OddTag()), Number(2017, OddTag()), IsMultiple(3, OddTag()),
[](int32_t j) { return ((j + 1) % 3 & 2) != 0 ? Number(2001, OddTag()) : Number(j, OddTag()); });
#endif
Modified: pstl/trunk/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.modifying.operations/rotate.pass.cpp Wed Apr 10 12:51:40 2019
@@ -78,8 +78,8 @@ struct compare<wrapper<T>>
struct test_one_policy
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specializations to skip testing in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specializations to skip testing in case of broken configuration
template <typename Iterator, typename Size>
void
operator()(pstl::execution::unsequenced_policy, Iterator data_b, Iterator data_e, Iterator actual_b,
Modified: pstl/trunk/test/std/algorithms/alg.modifying.operations/rotate_copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.modifying.operations/rotate_copy.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.modifying.operations/rotate_copy.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.modifying.operations/rotate_copy.pass.cpp Wed Apr 10 12:51:40 2019
@@ -73,8 +73,8 @@ struct comparator
struct test_one_policy
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration
template <typename Iterator1, typename Iterator2>
typename std::enable_if<is_same_iterator_category<Iterator1, std::random_access_iterator_tag>::value, void>::type
operator()(pstl::execution::unsequenced_policy, Iterator1 data_b, Iterator1 data_e, Iterator2 actual_b,
Modified: pstl/trunk/test/std/algorithms/alg.modifying.operations/unique.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.modifying.operations/unique.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.modifying.operations/unique.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.modifying.operations/unique.pass.cpp Wed Apr 10 12:51:40 2019
@@ -24,8 +24,8 @@ using namespace TestUtils;
struct run_unique
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
template <typename ForwardIt, typename Generator>
void
operator()(pstl::execution::unsequenced_policy, ForwardIt first1, ForwardIt last1, ForwardIt first2,
@@ -142,7 +142,7 @@ struct test_non_const
int32_t
main()
{
-#if !__PSTL_ICC_16_17_18_TEST_UNIQUE_MASK_RELEASE_BROKEN
+#if !_PSTL_ICC_16_17_18_TEST_UNIQUE_MASK_RELEASE_BROKEN
test<int32_t>([](size_t j) { return j / 3; },
[](const int32_t& val1, const int32_t& val2) { return val1 * val1 == val2 * val2; });
test<float64_t>([](size_t) { return float64_t(1); },
Modified: pstl/trunk/test/std/algorithms/alg.modifying.operations/unique_copy_equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.modifying.operations/unique_copy_equal.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.modifying.operations/unique_copy_equal.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.modifying.operations/unique_copy_equal.pass.cpp Wed Apr 10 12:51:40 2019
@@ -24,7 +24,7 @@ using namespace TestUtils;
struct run_unique_copy
{
-#if __PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN // dummy specializations to skip testing in case of broken configuration
+#if _PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN // dummy specializations to skip testing in case of broken configuration
template <typename InputIterator, typename OutputIterator, typename OutputIterator2, typename Size,
typename Predicate, typename T>
void
@@ -126,7 +126,7 @@ main(int32_t argc, char* argv[])
test<float32_t>(float32_t(42), std::equal_to<float32_t>(),
[](int32_t j) { return float32_t(5 * j / 23 ^ (j / 7)); });
-#if !__PSTL_ICC_16_17_TEST_REDUCTION_RELEASE_BROKEN
+#if !_PSTL_ICC_16_17_TEST_REDUCTION_RELEASE_BROKEN
test<float32_t>(float32_t(42), [](float32_t x, float32_t y) { return false; },
[](int32_t j) { return float32_t(j); }, false);
#endif
Modified: pstl/trunk/test/std/algorithms/alg.nonmodifying/all_of.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.nonmodifying/all_of.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.nonmodifying/all_of.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.nonmodifying/all_of.pass.cpp Wed Apr 10 12:51:40 2019
@@ -109,7 +109,7 @@ main()
test<int32_t>(8 * sizeof(int32_t));
test<uint16_t>(8 * sizeof(uint16_t));
test<float64_t>(53);
-#if !__PSTL_ICC_16_17_TEST_REDUCTION_BOOL_TYPE_RELEASE_64_BROKEN
+#if !_PSTL_ICC_16_17_TEST_REDUCTION_BOOL_TYPE_RELEASE_64_BROKEN
test<bool>(1);
#endif
Modified: pstl/trunk/test/std/algorithms/alg.nonmodifying/any_of.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.nonmodifying/any_of.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.nonmodifying/any_of.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.nonmodifying/any_of.pass.cpp Wed Apr 10 12:51:40 2019
@@ -95,7 +95,7 @@ main()
test<int32_t>(8 * sizeof(int32_t));
test<uint16_t>(8 * sizeof(uint16_t));
test<float64_t>(53);
-#if !__PSTL_ICC_16_17_TEST_REDUCTION_BOOL_TYPE_RELEASE_64_BROKEN
+#if !_PSTL_ICC_16_17_TEST_REDUCTION_BOOL_TYPE_RELEASE_64_BROKEN
test<bool>(1);
#endif
Modified: pstl/trunk/test/std/algorithms/alg.nonmodifying/count.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.nonmodifying/count.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.nonmodifying/count.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.nonmodifying/count.pass.cpp Wed Apr 10 12:51:40 2019
@@ -97,7 +97,7 @@ int32_t
main()
{
test<int32_t>(42, IsEqual<int32_t>(50, OddTag()), [](int32_t j) { return j; });
-#if !__PSTL_ICC_16_17_TEST_REDUCTION_RELEASE_BROKEN
+#if !_PSTL_ICC_16_17_TEST_REDUCTION_RELEASE_BROKEN
test<int32_t>(42, [](const int32_t& x) { return true; }, [](int32_t j) { return j; });
#endif
test<float64_t>(42, IsEqual<float64_t>(50, OddTag()), [](int32_t j) { return float64_t(j); });
Modified: pstl/trunk/test/std/algorithms/alg.nonmodifying/equal.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.nonmodifying/equal.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.nonmodifying/equal.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.nonmodifying/equal.pass.cpp Wed Apr 10 12:51:40 2019
@@ -159,7 +159,7 @@ main()
test<int32_t>(8 * sizeof(int32_t));
test<uint16_t>(8 * sizeof(uint16_t));
test<float64_t>(53);
-#if !__PSTL_ICC_16_17_TEST_REDUCTION_BOOL_TYPE_RELEASE_64_BROKEN
+#if !_PSTL_ICC_16_17_TEST_REDUCTION_BOOL_TYPE_RELEASE_64_BROKEN
test<bool>(1);
#endif
test<UserType>(256);
Modified: pstl/trunk/test/std/algorithms/alg.nonmodifying/find.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.nonmodifying/find.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.nonmodifying/find.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.nonmodifying/find.pass.cpp Wed Apr 10 12:51:40 2019
@@ -24,8 +24,8 @@ using namespace TestUtils;
struct test_find
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
template <typename Iterator, typename Value>
void
operator()(pstl::execution::unsequenced_policy, Iterator first, Iterator last, Value value)
Modified: pstl/trunk/test/std/algorithms/alg.nonmodifying/find_end.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.nonmodifying/find_end.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.nonmodifying/find_end.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.nonmodifying/find_end.pass.cpp Wed Apr 10 12:51:40 2019
@@ -23,8 +23,8 @@ using namespace TestUtils;
struct test_one_policy
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
template <typename Iterator1, typename Iterator2, typename Predicate>
void
operator()(pstl::execution::unsequenced_policy, Iterator1 b, Iterator1 e, Iterator2 bsub, Iterator2 esub,
@@ -115,7 +115,7 @@ main()
test<int32_t>(8 * sizeof(int32_t));
test<uint16_t>(8 * sizeof(uint16_t));
test<float64_t>(53);
-#if !__PSTL_ICC_16_17_TEST_REDUCTION_BOOL_TYPE_RELEASE_64_BROKEN
+#if !_PSTL_ICC_16_17_TEST_REDUCTION_BOOL_TYPE_RELEASE_64_BROKEN
test<bool>(1);
#endif
Modified: pstl/trunk/test/std/algorithms/alg.nonmodifying/find_first_of.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.nonmodifying/find_first_of.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.nonmodifying/find_first_of.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.nonmodifying/find_first_of.pass.cpp Wed Apr 10 12:51:40 2019
@@ -23,8 +23,8 @@ using namespace TestUtils;
struct test_one_policy
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
template <typename Iterator1, typename Iterator2, typename Predicate>
void
operator()(pstl::execution::unsequenced_policy, Iterator1 b, Iterator1 e, Iterator2 bsub, Iterator2 esub,
Modified: pstl/trunk/test/std/algorithms/alg.nonmodifying/find_if.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.nonmodifying/find_if.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.nonmodifying/find_if.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.nonmodifying/find_if.pass.cpp Wed Apr 10 12:51:40 2019
@@ -24,8 +24,8 @@ using namespace TestUtils;
struct test_find_if
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
template <typename Iterator, typename Predicate, typename NotPredicate>
void
operator()(pstl::execution::unsequenced_policy, Iterator first, Iterator last, Predicate pred,
@@ -95,7 +95,7 @@ struct test_non_const
int32_t
main()
{
-#if !__PSTL_ICC_17_TEST_MAC_RELEASE_32_BROKEN
+#if !_PSTL_ICC_17_TEST_MAC_RELEASE_32_BROKEN
// Note that the "hit" and "miss" functions here avoid overflow issues.
test<Number>(IsMultiple(5, OddTag()), [](int32_t j) { return Number(j - j % 5, OddTag()); }, // hit
[](int32_t j) { return Number(j % 5 == 0 ? j ^ 1 : j, OddTag()); }); // miss
Modified: pstl/trunk/test/std/algorithms/alg.nonmodifying/none_of.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.nonmodifying/none_of.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.nonmodifying/none_of.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.nonmodifying/none_of.pass.cpp Wed Apr 10 12:51:40 2019
@@ -93,7 +93,7 @@ main()
test<int32_t>(8 * sizeof(int32_t));
test<uint16_t>(8 * sizeof(uint16_t));
test<float64_t>(53);
-#if !__PSTL_ICC_16_17_TEST_REDUCTION_BOOL_TYPE_RELEASE_64_BROKEN
+#if !_PSTL_ICC_16_17_TEST_REDUCTION_BOOL_TYPE_RELEASE_64_BROKEN
test<bool>(1);
#endif
Modified: pstl/trunk/test/std/algorithms/alg.nonmodifying/nth_element.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.nonmodifying/nth_element.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.nonmodifying/nth_element.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.nonmodifying/nth_element.pass.cpp Wed Apr 10 12:51:40 2019
@@ -73,8 +73,8 @@ is_equal(const T& x, const T& y)
struct test_one_policy
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration
template <typename Iterator1, typename Size, typename Generator1, typename Generator2, typename Compare>
typename std::enable_if<is_same_iterator_category<Iterator1, std::random_access_iterator_tag>::value, void>::type
operator()(pstl::execution::unsequenced_policy, Iterator1 first1, Iterator1 last1, Iterator1 first2,
Modified: pstl/trunk/test/std/algorithms/alg.nonmodifying/search_n.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.nonmodifying/search_n.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.nonmodifying/search_n.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.nonmodifying/search_n.pass.cpp Wed Apr 10 12:51:40 2019
@@ -23,8 +23,8 @@ using namespace TestUtils;
struct test_one_policy
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
template <typename Iterator, typename Size, typename T, typename Predicate>
void
operator()(pstl::execution::unsequenced_policy, Iterator b, Iterator e, Size count, const T& value, Predicate pred)
@@ -101,7 +101,7 @@ main()
test<int32_t>();
test<uint16_t>();
test<float64_t>();
-#if !__PSTL_ICC_16_17_TEST_REDUCTION_BOOL_TYPE_RELEASE_64_BROKEN
+#if !_PSTL_ICC_16_17_TEST_REDUCTION_BOOL_TYPE_RELEASE_64_BROKEN
test<bool>();
#endif
Modified: pstl/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is_heap.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is_heap.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is_heap.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.sorting/alg.heap.operations/is_heap.pass.cpp Wed Apr 10 12:51:40 2019
@@ -38,8 +38,8 @@ struct WithCmpOp
struct test_is_heap
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN //dummy specialization by policy type, in case of broken configuration
template <typename Iterator, typename Predicate>
typename std::enable_if<is_same_iterator_category<Iterator, std::random_access_iterator_tag>::value, void>::type
operator()(pstl::execution::unsequenced_policy, Iterator first, Iterator last, Predicate pred)
Modified: pstl/trunk/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp Wed Apr 10 12:51:40 2019
@@ -165,7 +165,7 @@ main()
{
test<uint16_t, float64_t>(std::less<float64_t>());
test<float32_t, int32_t>(std::greater<float32_t>());
-#if !__PSTL_ICC_18_TEST_EARLY_EXIT_AVX_RELEASE_BROKEN
+#if !_PSTL_ICC_18_TEST_EARLY_EXIT_AVX_RELEASE_BROKEN
test<float64_t, int32_t>([](const float64_t x, const int32_t y) { return x * x < y * y; });
#endif
test<LocalWrapper<int32_t>, LocalWrapper<int32_t>>(
Modified: pstl/trunk/test/std/algorithms/alg.sorting/partial_sort.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.sorting/partial_sort.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.sorting/partial_sort.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.sorting/partial_sort.pass.cpp Wed Apr 10 12:51:40 2019
@@ -86,7 +86,7 @@ struct test_brick_partial_sort
if (m1 - first > 1)
{
auto complex = std::ceil(n * std::log(float32_t(m1 - first)));
-#if defined(__PSTL_PAR_BACKEND_TBB)
+#if defined(_PSTL_PAR_BACKEND_TBB)
auto p = tbb::this_task_arena::max_concurrency();
#else
auto p = 1;
Modified: pstl/trunk/test/std/algorithms/alg.sorting/partial_sort_copy.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/algorithms/alg.sorting/partial_sort_copy.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/algorithms/alg.sorting/partial_sort_copy.pass.cpp (original)
+++ pstl/trunk/test/std/algorithms/alg.sorting/partial_sort_copy.pass.cpp Wed Apr 10 12:51:40 2019
@@ -59,8 +59,8 @@ struct test_one_policy
: d_first(b1), d_last(e1), exp_first(b2), exp_last(e2)
{
}
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration
template <typename InputIterator, typename Size, typename T, typename Compare>
void
operator()(pstl::execution::unsequenced_policy, InputIterator first, InputIterator last, Size n1, Size n2,
Modified: pstl/trunk/test/std/numerics/numeric.ops/adjacent_difference.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/numerics/numeric.ops/adjacent_difference.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/numerics/numeric.ops/adjacent_difference.pass.cpp (original)
+++ pstl/trunk/test/std/numerics/numeric.ops/adjacent_difference.pass.cpp Wed Apr 10 12:51:40 2019
@@ -97,8 +97,8 @@ compute_and_check(Iterator1 first, Itera
struct test_one_policy
{
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
- __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \
+ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration
template <typename Iterator1, typename Iterator2, typename T, typename Function>
typename std::enable_if<is_same_iterator_category<Iterator1, std::random_access_iterator_tag>::value, void>::type
operator()(pstl::execution::unsequenced_policy, Iterator1 data_b, Iterator1 data_e, Iterator2 actual_b,
Modified: pstl/trunk/test/std/numerics/numeric.ops/reduce.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/numerics/numeric.ops/reduce.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/numerics/numeric.ops/reduce.pass.cpp (original)
+++ pstl/trunk/test/std/numerics/numeric.ops/reduce.pass.cpp Wed Apr 10 12:51:40 2019
@@ -57,7 +57,7 @@ test_long_form(T init, BinaryOp binary_o
struct test_two_short_forms
{
-#if __PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN //dummy specialization by policy type, in case of broken configuration
+#if _PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN //dummy specialization by policy type, in case of broken configuration
template <typename Iterator>
void
operator()(pstl::execution::parallel_policy, Iterator first, Iterator last, Sum init, Sum expected)
Modified: pstl/trunk/test/std/numerics/numeric.ops/scan.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/numerics/numeric.ops/scan.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/numerics/numeric.ops/scan.pass.cpp (original)
+++ pstl/trunk/test/std/numerics/numeric.ops/scan.pass.cpp Wed Apr 10 12:51:40 2019
@@ -187,7 +187,7 @@ main()
for (int32_t mode = 0; mode < 2; ++mode)
{
inclusive = mode != 0;
-#if !__PSTL_ICC_19_TEST_SIMD_UDS_WINDOWS_RELEASE_BROKEN
+#if !_PSTL_ICC_19_TEST_SIMD_UDS_WINDOWS_RELEASE_BROKEN
// Test with highly restricted type and associative but not commutative operation
test_matrix<Matrix2x2<int32_t>, Matrix2x2<int32_t>>(Matrix2x2<int32_t>(), multiply_matrix<int32_t>,
Matrix2x2<int32_t>(-666, 666));
Modified: pstl/trunk/test/std/numerics/numeric.ops/transform_scan.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/numerics/numeric.ops/transform_scan.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/numerics/numeric.ops/transform_scan.pass.cpp (original)
+++ pstl/trunk/test/std/numerics/numeric.ops/transform_scan.pass.cpp Wed Apr 10 12:51:40 2019
@@ -168,7 +168,7 @@ main()
for (int32_t mode = 0; mode < 2; ++mode)
{
inclusive = mode != 0;
-#if !__PSTL_ICC_19_TEST_SIMD_UDS_WINDOWS_RELEASE_BROKEN
+#if !_PSTL_ICC_19_TEST_SIMD_UDS_WINDOWS_RELEASE_BROKEN
test_matrix<Matrix2x2<int32_t>, Matrix2x2<int32_t>>([](const Matrix2x2<int32_t> x) { return x; },
Matrix2x2<int32_t>(), multiply_matrix<int32_t>,
Matrix2x2<int32_t>(-666, 666));
Modified: pstl/trunk/test/std/utilities/memory/specialized.algorithms/uninitialized_construct.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/utilities/memory/specialized.algorithms/uninitialized_construct.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/utilities/memory/specialized.algorithms/uninitialized_construct.pass.cpp (original)
+++ pstl/trunk/test/std/utilities/memory/specialized.algorithms/uninitialized_construct.pass.cpp Wed Apr 10 12:51:40 2019
@@ -112,7 +112,7 @@ main()
{
// for user-defined types
-#if !__PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN
+#if !_PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN
test_uninit_construct_by_type<Wrapper<int32_t>>();
test_uninit_construct_by_type<Wrapper<std::vector<std::string>>>();
#endif
Modified: pstl/trunk/test/std/utilities/memory/specialized.algorithms/uninitialized_copy_move.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/std/utilities/memory/specialized.algorithms/uninitialized_copy_move.pass.cpp?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/std/utilities/memory/specialized.algorithms/uninitialized_copy_move.pass.cpp (original)
+++ pstl/trunk/test/std/utilities/memory/specialized.algorithms/uninitialized_copy_move.pass.cpp Wed Apr 10 12:51:40 2019
@@ -76,7 +76,7 @@ struct test_uninitialized_copy_move
std::destroy_n(exec, out_first, n);
}
-#if __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN
+#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN
template <typename InputIterator, typename OutputIterator>
void
operator()(pstl::execution::unsequenced_policy, InputIterator first, InputIterator last, OutputIterator out_first,
@@ -138,8 +138,8 @@ main()
test_uninitialized_copy_move_by_type<float64_t>();
// for user-defined types
-#if !__PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN && !__PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN && \
- !__PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN
+#if !_PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN && !_PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN && \
+ !_PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN
test_uninitialized_copy_move_by_type<Wrapper<int8_t>>();
#endif
Modified: pstl/trunk/test/support/pstl_test_config.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/support/pstl_test_config.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/support/pstl_test_config.h (original)
+++ pstl/trunk/test/support/pstl_test_config.h Wed Apr 10 12:51:40 2019
@@ -7,43 +7,43 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __PSTL_TEST_config_H
-#define __PSTL_TEST_config_H
+#ifndef _PSTL_TEST_config_H
+#define _PSTL_TEST_config_H
#if defined(_MSC_VER) && defined(_DEBUG)
#define _SCL_SECURE_NO_WARNINGS //to prevent the compilation warning. Microsoft STL implementation has specific checking of an iterator range in DEBUG mode for the containers from the standard library.
#endif
-#define __PSTL_ICC_16_17_TEST_REDUCTION_BOOL_TYPE_RELEASE_64_BROKEN \
+#define _PSTL_ICC_16_17_TEST_REDUCTION_BOOL_TYPE_RELEASE_64_BROKEN \
(__x86_64 && !_DEBUG && __INTEL_COMPILER && __INTEL_COMPILER <= 1700 && !__APPLE__)
-#define __PSTL_ICC_16_17_TEST_REDUCTION_RELEASE_BROKEN \
+#define _PSTL_ICC_16_17_TEST_REDUCTION_RELEASE_BROKEN \
(!_DEBUG && __INTEL_COMPILER && \
(__INTEL_COMPILER < 1800 || (__INTEL_COMPILER == 1800 && __INTEL_COMPILER_UPDATE < 1)))
-#define __PSTL_ICC_1800_TEST_MONOTONIC_RELEASE_64_BROKEN \
+#define _PSTL_ICC_1800_TEST_MONOTONIC_RELEASE_64_BROKEN \
(__x86_64 && !_DEBUG && __INTEL_COMPILER && __INTEL_COMPILER == 1800 && __INTEL_COMPILER_UPDATE < 1)
-#define __PSTL_ICC_17_TEST_MAC_RELEASE_32_BROKEN \
+#define _PSTL_ICC_17_TEST_MAC_RELEASE_32_BROKEN \
(__i386__ && !_DEBUG && __INTEL_COMPILER >= 1700 && __INTEL_COMPILER < 1800 && __APPLE__)
-#define __PSTL_ICC_18_VC141_TEST_SIMD_LAMBDA_RELEASE_BROKEN \
+#define _PSTL_ICC_18_VC141_TEST_SIMD_LAMBDA_RELEASE_BROKEN \
(!_DEBUG && __INTEL_COMPILER >= 1800 && __INTEL_COMPILER < 1900 && _MSC_VER == 1910)
-#define __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN \
+#define _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN \
(_M_IX86 && _DEBUG && __INTEL_COMPILER >= 1700 && __INTEL_COMPILER < 1800 && _MSC_VER >= 1900)
-#define __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN \
+#define _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN \
(_M_IX86 && _DEBUG && __INTEL_COMPILER >= 1600 && __INTEL_COMPILER < 1700 && _MSC_VER == 1900)
-#define __PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN \
- (__PSTL_USE_PAR_POLICIES && ((_M_X64 && _MSC_VER == 1900) || __x86_64) && !_DEBUG && __INTEL_COMPILER < 1700)
-#define __PSTL_ICC_16_17_TEST_64_TIMEOUT (__x86_64 && __INTEL_COMPILER && __INTEL_COMPILER < 1800 && !__APPLE__)
-#define __PSTL_ICC_18_TEST_EARLY_EXIT_MONOTONIC_RELEASE_BROKEN (!_DEBUG && __INTEL_COMPILER && __INTEL_COMPILER == 1800)
-#define __PSTL_CLANG_TEST_BIG_OBJ_DEBUG_32_BROKEN \
- (__i386__ && PSTL_USE_DEBUG && __clang__ && __PSTL_CLANG_VERSION <= 90000)
-#define __PSTL_ICC_16_17_18_TEST_UNIQUE_MASK_RELEASE_BROKEN \
+#define _PSTL_ICC_16_VC14_TEST_PAR_TBB_RT_RELEASE_64_BROKEN \
+ (_PSTL_USE_PAR_POLICIES && ((_M_X64 && _MSC_VER == 1900) || __x86_64) && !_DEBUG && __INTEL_COMPILER < 1700)
+#define _PSTL_ICC_16_17_TEST_64_TIMEOUT (__x86_64 && __INTEL_COMPILER && __INTEL_COMPILER < 1800 && !__APPLE__)
+#define _PSTL_ICC_18_TEST_EARLY_EXIT_MONOTONIC_RELEASE_BROKEN (!_DEBUG && __INTEL_COMPILER && __INTEL_COMPILER == 1800)
+#define _PSTL_CLANG_TEST_BIG_OBJ_DEBUG_32_BROKEN \
+ (__i386__ && PSTL_USE_DEBUG && __clang__ && _PSTL_CLANG_VERSION <= 90000)
+#define _PSTL_ICC_16_17_18_TEST_UNIQUE_MASK_RELEASE_BROKEN \
(!_DEBUG && __INTEL_COMPILER && \
(__INTEL_COMPILER < 1800 || (__INTEL_COMPILER == 1800 && __INTEL_COMPILER_UPDATE < 3)))
-#define __PSTL_ICC_18_TEST_EARLY_EXIT_AVX_RELEASE_BROKEN \
+#define _PSTL_ICC_18_TEST_EARLY_EXIT_AVX_RELEASE_BROKEN \
(!_DEBUG && __INTEL_COMPILER == 1800 && __AVX__ && !__AVX2__ && !__AVX512__)
-#define __PSTL_ICC_19_TEST_IS_PARTITIONED_RELEASE_BROKEN \
+#define _PSTL_ICC_19_TEST_IS_PARTITIONED_RELEASE_BROKEN \
(!PSTL_USE_DEBUG && (__linux__ || __APPLE__) && __INTEL_COMPILER == 1900)
-#define __PSTL_ICL_19_VC14_VC141_TEST_SCAN_RELEASE_BROKEN \
+#define _PSTL_ICL_19_VC14_VC141_TEST_SCAN_RELEASE_BROKEN \
(__INTEL_COMPILER == 1900 && _MSC_VER >= 1900 && _MSC_VER <= 1910)
-#define __PSTL_ICC_19_TEST_SIMD_UDS_WINDOWS_RELEASE_BROKEN (__INTEL_COMPILER == 1900 && _MSC_VER && !_DEBUG)
+#define _PSTL_ICC_19_TEST_SIMD_UDS_WINDOWS_RELEASE_BROKEN (__INTEL_COMPILER == 1900 && _MSC_VER && !_DEBUG)
-#endif /* __PSTL_TEST_config_H */
+#endif /* _PSTL_TEST_config_H */
Modified: pstl/trunk/test/support/utils.h
URL: http://llvm.org/viewvc/llvm-project/pstl/trunk/test/support/utils.h?rev=358131&r1=358130&r2=358131&view=diff
==============================================================================
--- pstl/trunk/test/support/utils.h (original)
+++ pstl/trunk/test/support/utils.h Wed Apr 10 12:51:40 2019
@@ -572,7 +572,7 @@ struct Matrix2x2
T a[2][2];
Matrix2x2() : a{{1, 0}, {0, 1}} {}
Matrix2x2(T x, T y) : a{{0, x}, {x, y}} {}
-#if !__PSTL_ICL_19_VC14_VC141_TEST_SCAN_RELEASE_BROKEN
+#if !_PSTL_ICL_19_VC14_VC141_TEST_SCAN_RELEASE_BROKEN
Matrix2x2(const Matrix2x2& m) : a{{m.a[0][0], m.a[0][1]}, {m.a[1][0], m.a[1][1]}} {}
Matrix2x2&
operator=(const Matrix2x2& m)
@@ -607,9 +607,9 @@ multiply_matrix(const Matrix2x2<T>& left
}
// Check that Intel(R) Threading Building Blocks header files are not used when parallel policies are off
-#if !__PSTL_USE_PAR_POLICIES
+#if !_PSTL_USE_PAR_POLICIES
#if defined(TBB_INTERFACE_VERSION)
-#error The parallel backend is used while it should not (__PSTL_USE_PAR_POLICIES==0)
+#error The parallel backend is used while it should not (_PSTL_USE_PAR_POLICIES==0)
#endif
#endif
@@ -658,7 +658,7 @@ struct ReverseAdapter
iterator_type
operator()(Iterator it)
{
-#if __PSTL_CPP14_MAKE_REVERSE_ITERATOR_PRESENT
+#if _PSTL_CPP14_MAKE_REVERSE_ITERATOR_PRESENT
return std::make_reverse_iterator(it);
#else
return iterator_type(it);
@@ -1051,7 +1051,7 @@ invoke_on_all_policies(Op op, T&&... res
// Try static execution policies
invoke_on_all_iterator_types()(seq, op, std::forward<T>(rest)...);
invoke_on_all_iterator_types()(unseq, op, std::forward<T>(rest)...);
-#if __PSTL_USE_PAR_POLICIES
+#if _PSTL_USE_PAR_POLICIES
invoke_on_all_iterator_types()(par, op, std::forward<T>(rest)...);
invoke_on_all_iterator_types()(par_unseq, op, std::forward<T>(rest)...);
#endif
@@ -1200,7 +1200,7 @@ transform_reduce_serial(InputIterator fi
static const char*
done()
{
-#if __PSTL_TEST_SUCCESSFUL_KEYWORD
+#if _PSTL_TEST_SUCCESSFUL_KEYWORD
return "done";
#else
return "passed";
@@ -1237,7 +1237,7 @@ template <typename Policy, typename F>
static void
invoke_if(Policy&& p, F f)
{
-#if __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN
+#if _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN
__pstl::__internal::invoke_if_not(__pstl::__internal::allow_unsequenced<Policy>(), f);
#else
f();
More information about the libcxx-commits
mailing list