From bb1e91fadde1ef813959bfb1d44a98531c256f8c Mon Sep 17 00:00:00 2001
From: Thomas Rodgers <trodgers@redhat.com>
Date: Thu, 23 May 2019 16:49:49 -0700
Subject: [PATCH] Rename PSTL header guards
Rename header guards to be consistent with upstream project's conventions.
* include/pstl/glue_memory_impl.h: Rename all macros of the form
_PSTL_(.*)_H to _PSTL_\U\1_H.
* include/pstl/numeric_impl.h: Likewise.
* include/pstl/glue_memory_defs.h: Likewise.
* include/pstl/execution_defs.h: Likewise.
* include/pstl/utils.h: Likewise.
* include/pstl/algorithm_fwd.h: Likewise.
* include/pstl/unseq_backend_simd.h: Likewise.
* include/pstl/glue_execution_defs.h: Likewise.
* include/pstl/algorithm_impl.h: Likewise.
* include/pstl/parallel_impl.h: Likewise.
* include/pstl/memory_impl.h: Likewise.
* include/pstl/glue_numeric_defs.h: Likewise.
* include/pstl/parallel_backend_utils.h: Likewise.
* include/pstl/glue_algorithm_defs.h: Likewise.
* include/pstl/parallel_backend.h: Likewise.
* include/pstl/glue_numeric_impl.h: Likewise.
* include/pstl/parallel_backend_tbb.h: Likewise.
* include/pstl/numeric_fwd.h: Likewise.
* include/pstl/glue_algorithm_impl.h: Likewise.
* include/pstl/execution_impl.h: Likewise.
* include/pstl/pstl_config.h: Likewise.
* testsuite/util/pstl/pstl_test_config.h: Likewise.
---
libstdc++-v3/include/pstl/algorithm_fwd.h | 6 +++---
libstdc++-v3/include/pstl/algorithm_impl.h | 6 +++---
libstdc++-v3/include/pstl/execution_defs.h | 6 +++---
libstdc++-v3/include/pstl/execution_impl.h | 6 +++---
libstdc++-v3/include/pstl/glue_algorithm_defs.h | 6 +++---
libstdc++-v3/include/pstl/glue_algorithm_impl.h | 6 +++---
libstdc++-v3/include/pstl/glue_execution_defs.h | 6 +++---
libstdc++-v3/include/pstl/glue_memory_defs.h | 6 +++---
libstdc++-v3/include/pstl/glue_memory_impl.h | 6 +++---
libstdc++-v3/include/pstl/glue_numeric_defs.h | 6 +++---
libstdc++-v3/include/pstl/glue_numeric_impl.h | 6 +++---
libstdc++-v3/include/pstl/memory_impl.h | 6 +++---
libstdc++-v3/include/pstl/numeric_fwd.h | 6 +++---
libstdc++-v3/include/pstl/numeric_impl.h | 6 +++---
libstdc++-v3/include/pstl/parallel_backend.h | 6 +++---
libstdc++-v3/include/pstl/parallel_backend_tbb.h | 6 +++---
libstdc++-v3/include/pstl/parallel_backend_utils.h | 6 +++---
libstdc++-v3/include/pstl/parallel_impl.h | 6 +++---
libstdc++-v3/include/pstl/pstl_config.h | 6 +++---
libstdc++-v3/include/pstl/unseq_backend_simd.h | 6 +++---
libstdc++-v3/include/pstl/utils.h | 6 +++---
libstdc++-v3/testsuite/util/pstl/pstl_test_config.h | 6 +++---
22 files changed, 66 insertions(+), 66 deletions(-)
@@ -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>
@@ -1333,4 +1333,4 @@ __pattern_lexicographical_compare(_ExecutionPolicy&&, _ForwardIterator1, _Forwar
} // namespace __internal
} // namespace __pstl
-#endif /* _PSTL_algorithm_fwd_H */
+#endif /* _PSTL_ALGORITHM_FWD_H */
@@ -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>
@@ -3716,4 +3716,4 @@ __pattern_lexicographical_compare(_ExecutionPolicy&& __exec, _ForwardIterator1 _
} // namespace __internal
} // namespace __pstl
-#endif /* _PSTL_algorithm_impl_H */
+#endif /* _PSTL_ALGORITHM_IMPL_H */
@@ -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>
@@ -165,4 +165,4 @@ using __enable_if_execution_policy =
} // namespace __pstl
-#endif /* _PSTL_execution_policy_defs_H */
+#endif /* _PSTL_EXECUTION_POLICY_DEFS_H */
@@ -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>
@@ -152,4 +152,4 @@ struct __prefer_parallel_tag
} // namespace __internal
} // namespace __pstl
-#endif /* _PSTL_execution_impl_H */
+#endif /* _PSTL_EXECUTION_IMPL_H */
@@ -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>
@@ -548,4 +548,4 @@ lexicographical_compare(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _
_ForwardIterator2 __first2, _ForwardIterator2 __last2);
} // namespace std
-#endif /* _PSTL_glue_algorithm_defs_H */
+#endif /* _PSTL_GLUE_ALGORITHM_DEFS_H */
@@ -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>
@@ -1179,4 +1179,4 @@ lexicographical_compare(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _
} // namespace std
-#endif /* _PSTL_glue_algorithm_impl_H */
+#endif /* _PSTL_GLUE_ALGORITHM_IMPL_H */
@@ -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>
@@ -53,4 +53,4 @@ using __pstl::execution::unsequenced_policy;
#include "numeric_impl.h"
#include "parallel_backend.h"
-#endif /* _PSTL_glue_execution_defs_H */
+#endif /* _PSTL_GLUE_EXECUTION_DEFS_H */
@@ -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_execution_policy<_ExecutionPolicy, _ForwardItera
uninitialized_value_construct_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size __n);
} // namespace std
-#endif /* _PSTL_glue_memory_defs_H */
+#endif /* _PSTL_GLUE_MEMORY_DEFS_H */
@@ -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 "utils.h"
#include "algorithm_fwd.h"
@@ -355,4 +355,4 @@ uninitialized_value_construct_n(_ExecutionPolicy&& __exec, _ForwardIterator __fi
} // namespace std
-#endif /* _PSTL_glue_memory_imple_H */
+#endif /* _PSTL_GLUE_MEMORY_IMPL_H */
@@ -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 "execution_defs.h"
@@ -113,4 +113,4 @@ adjacent_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _Forwa
_ForwardIterator2 __d_first);
} // namespace std
-#endif /* _PSTL_glue_numeric_defs_H */
+#endif /* _PSTL_GLUE_NUMERIC_DEFS_H */
@@ -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>
@@ -221,4 +221,4 @@ adjacent_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _Forwa
} // namespace std
-#endif /* _PSTL_glue_numeric_impl_H_ */
+#endif /* _PSTL_GLUE_NUMERIC_IMPL_H_ */
@@ -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(_ForwardIterator __first, _ForwardIterator __last, _O
} // namespace __internal
} // namespace __pstl
-#endif /* _PSTL_memory_impl_H */
+#endif /* _PSTL_MEMORY_IMPL_H */
@@ -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>
@@ -143,4 +143,4 @@ __pattern_adjacent_difference(_ExecutionPolicy&&, _ForwardIterator, _ForwardIter
} // namespace __internal
} // namespace __pstl
-#endif /* _PSTL_numeric_fwd_H */
+#endif /* _PSTL_NUMERIC_FWD_H */
@@ -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>
@@ -365,4 +365,4 @@ __pattern_adjacent_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __fir
} // namespace __internal
} // namespace __pstl
-#endif /* _PSTL_numeric_impl_H */
+#endif /* _PSTL_NUMERIC_IMPL_H */
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#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
#include "parallel_backend_tbb.h"
@@ -16,4 +16,4 @@
_PSTL_PRAGMA_MESSAGE("Parallel backend was not specified");
#endif
-#endif /* _PSTL_parallel_backend_H */
+#endif /* _PSTL_PARALLEL_BACKEND_H */
@@ -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 <algorithm>
#include <type_traits>
@@ -651,4 +651,4 @@ __parallel_invoke(_ExecutionPolicy&&, _F1&& __f1, _F2&& __f2)
} // namespace __par_backend
} // namespace __pstl
-#endif /* _PSTL_parallel_backend_tbb_H */
+#endif /* _PSTL_PARALLEL_BACKEND_TBB_H */
@@ -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>
@@ -192,4 +192,4 @@ class __stack
} // namespace __par_backend
} // namespace __pstl
-#endif /* _PSTL_parallel_backend_utils_H */
+#endif /* _PSTL_PARALLEL_BACKEND_UTILS_H */
@@ -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, _Index __first, _Index __last, _Brick _
} // namespace __internal
} // namespace __pstl
-#endif /* _PSTL_parallel_impl_H */
+#endif /* _PSTL_PARALLEL_IMPL_H */
@@ -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)
@@ -171,4 +171,4 @@
#define _PSTL_ICC_18_OMP_SIMD_BROKEN (__INTEL_COMPILER == 1800)
-#endif /* _PSTL_config_H */
+#endif /* _PSTL_CONFIG_H */
@@ -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>
@@ -852,4 +852,4 @@ __simd_remove_if(_RandomAccessIterator __first, _DifferenceType __n, _UnaryPredi
} // namespace __unseq_backend
} // namespace __pstl
-#endif /* _PSTL_unseq_backend_simd_H */
+#endif /* _PSTL_UNSEQ_BACKEND_SIMD_H */
@@ -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(_ForwardIterator __a, _ForwardIterator __b, _Compare _
} // namespace __internal
} // namespace __pstl
-#endif /* _PSTL_utils_H */
+#endif /* _PSTL_UTILS_H */
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#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.
@@ -46,4 +46,4 @@
(__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)
-#endif /* _PSTL_TEST_config_H */
+#endif /* _PSTL_TEST_CONFIG_H */
--
2.20.1