Commit 593cda3e by Jonathan Wakely Committed by Jonathan Wakely

Fix uses of non-reserved names for template parameters

	* include/bits/random.h (seed_seq::param): Fix non-reserved name.
	* include/experimental/type_traits (is_detected_exact)
	(is_detected_exact_v): Likewise.
	* include/pstl/execution_defs.h (is_execution_policy)
	(is_execution_policy_v, __enable_if_execution_policy): Likewise.
	* include/pstl/execution_impl.h (__policy_traits): Likewise.
	* testsuite/17_intro/names.cc: Check for more non-reserved names.
	* testsuite/experimental/names.cc: New test.

From-SVN: r271324
parent e625ccc2
2019-05-17 Jonathan Wakely <jwakely@redhat.com> 2019-05-17 Jonathan Wakely <jwakely@redhat.com>
* include/bits/random.h (seed_seq::param): Fix non-reserved name.
* include/experimental/type_traits (is_detected_exact)
(is_detected_exact_v): Likewise.
* include/pstl/execution_defs.h (is_execution_policy)
(is_execution_policy_v, __enable_if_execution_policy): Likewise.
* include/pstl/execution_impl.h (__policy_traits): Likewise.
* testsuite/17_intro/names.cc: Check for more non-reserved names.
* testsuite/experimental/names.cc: New test.
PR libstdc++/85965 PR libstdc++/85965
* include/bits/hashtable.h (_Hashtable::~_Hashtable()): Remove static * include/bits/hashtable.h (_Hashtable::~_Hashtable()): Remove static
assertions from the destructor. assertions from the destructor.
......
...@@ -6080,9 +6080,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -6080,9 +6080,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
size_t size() const noexcept size_t size() const noexcept
{ return _M_v.size(); } { return _M_v.size(); }
template<typename OutputIterator> template<typename _OutputIterator>
void void
param(OutputIterator __dest) const param(_OutputIterator __dest) const
{ std::copy(_M_v.begin(), _M_v.end(), __dest); } { std::copy(_M_v.begin(), _M_v.end(), __dest); }
// no copy functions // no copy functions
......
...@@ -252,12 +252,12 @@ template<typename _Default, template<typename...> class _Op, typename... _Args> ...@@ -252,12 +252,12 @@ template<typename _Default, template<typename...> class _Op, typename... _Args>
template<typename _Default, template<typename...> class _Op, typename... _Args> template<typename _Default, template<typename...> class _Op, typename... _Args>
using detected_or_t = typename detected_or<_Default, _Op, _Args...>::type; using detected_or_t = typename detected_or<_Default, _Op, _Args...>::type;
template<typename Expected, template<typename...> class _Op, typename... _Args> template<typename _Expected, template<typename...> class _Op, typename... _Args>
using is_detected_exact = is_same<Expected, detected_t<_Op, _Args...>>; using is_detected_exact = is_same<_Expected, detected_t<_Op, _Args...>>;
template<typename Expected, template<typename...> class _Op, typename... _Args> template<typename _Expected, template<typename...> class _Op, typename... _Args>
constexpr bool is_detected_exact_v constexpr bool is_detected_exact_v
= is_detected_exact<Expected, _Op, _Args...>::value; = is_detected_exact<_Expected, _Op, _Args...>::value;
template<typename _To, template<typename...> class _Op, typename... _Args> template<typename _To, template<typename...> class _Op, typename... _Args>
using is_detected_convertible using is_detected_convertible
......
...@@ -117,7 +117,7 @@ constexpr parallel_unsequenced_policy par_unseq{}; ...@@ -117,7 +117,7 @@ constexpr parallel_unsequenced_policy par_unseq{};
constexpr unsequenced_policy unseq{}; constexpr unsequenced_policy unseq{};
// 2.3, Execution policy type trait // 2.3, Execution policy type trait
template <class T> template <class _Tp>
struct is_execution_policy : std::false_type struct is_execution_policy : std::false_type
{ {
}; };
...@@ -142,8 +142,8 @@ struct is_execution_policy<__pstl::execution::unsequenced_policy> : std::true_ty ...@@ -142,8 +142,8 @@ struct is_execution_policy<__pstl::execution::unsequenced_policy> : std::true_ty
}; };
#if __PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT #if __PSTL_CPP14_VARIABLE_TEMPLATES_PRESENT
template <class T> template <class _Tp>
constexpr bool is_execution_policy_v = __pstl::execution::is_execution_policy<T>::value; constexpr bool is_execution_policy_v = __pstl::execution::is_execution_policy<_Tp>::value;
#endif #endif
} // namespace v1 } // namespace v1
...@@ -151,10 +151,10 @@ constexpr bool is_execution_policy_v = __pstl::execution::is_execution_policy<T> ...@@ -151,10 +151,10 @@ constexpr bool is_execution_policy_v = __pstl::execution::is_execution_policy<T>
namespace __internal namespace __internal
{ {
template <class ExecPolicy, class T> template <class _ExecPolicy, class _Tp>
using __enable_if_execution_policy = using __enable_if_execution_policy =
typename std::enable_if<__pstl::execution::is_execution_policy<typename std::decay<ExecPolicy>::type>::value, typename std::enable_if<__pstl::execution::is_execution_policy<typename std::decay<_ExecPolicy>::type>::value,
T>::type; _Tp>::type;
} // namespace __internal } // namespace __internal
} // namespace __pstl } // namespace __pstl
......
...@@ -66,7 +66,7 @@ struct __is_random_access_iterator<_IteratorType> ...@@ -66,7 +66,7 @@ struct __is_random_access_iterator<_IteratorType>
}; };
/* policy */ /* policy */
template <typename Policy> template <typename _Policy>
struct __policy_traits struct __policy_traits
{ {
}; };
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
// Define macros for some common variables names that we must not use for // Define macros for some common variables names that we must not use for
// naming variables, parameters etc. in the library. // naming variables, parameters etc. in the library.
#define tmp (
#define A ( #define A (
#define B ( #define B (
#define C ( #define C (
...@@ -99,6 +98,78 @@ ...@@ -99,6 +98,78 @@
#define y ( #define y (
#define z ( #define z (
#define tmp (
#if __cplusplus < 201703L
// <charconv> defines to_chars_result::ptr and to_chars_result::ec
#define ec (
#define ptr (
#endif
// Common template parameter names
#define OutputIterator OutputIterator is not a reserved name
#define InputIterator InputIterator is not a reserved name
#define ForwardIterator ForwardIterator is not a reserved name
#define BidirectionalIterator BidirectionalIterator is not a reserved name
#define RandomAccessIterator RandomAccessIterator is not a reserved name
#define RandomAccessOutputIterator RandomAccessOutputIterator is not a reserved name
#define RAIter RAIter is not a reserved name
#define FwdIter FwdIter is not a reserved name
#define OutIter OutIter is not a reserved name
#define InIter InIter is not a reserved name
#define Alloc Alloc is not a reserved name
#define BinaryFunction1 BinaryFunction1 is not a reserved name
#define BinaryFunction2 BinaryFunction2 is not a reserved name
#define Char Char is not a reserved name
#define CharT CharT is not a reserved name
#define Cmp Cmp is not a reserved name
#define Compare Compare is not a reserved name
#define Const_Iterator Const_Iterator is not a reserved name
#define Const_Key_Reference Const_Key_Reference is not a reserved name
#define Const_Node_Iter Const_Node_Iter is not a reserved name
#define Const_Pointer Const_Pointer is not a reserved name
#define Const_Reference Const_Reference is not a reserved name
#define Data Data is not a reserved name
#define DiffType DiffType is not a reserved name
#define Eq Eq is not a reserved name
#define ExecPolicy ExecPolicy is not a reserved name
#define Expected Expected is not a reserved name
#define External_Load_Access External_Load_Access is not a reserved name
#define External_Size_Access External_Size_Access is not a reserved name
#define Fn Fn is not a reserved name
#define Function Function is not a reserved name
#define Functor Functor is not a reserved name
#define Hash Hash is not a reserved name
#define H1 H1 is not a reserved name
#define H2 H2 is not a reserved name
#define Head Head is not a reserved name
#define It It is not a reserved name
#define Iter Iter is not a reserved name
#define Iterator Iterator is not a reserved name
#define Key Key is not a reserved name
#define Mapped Mapped is not a reserved name
#define Node Node is not a reserved name
#define Node_iter Node_iter is not a reserved name
#define Node_ptr Node_ptr is not a reserved name
#define Overflow Overflow is not a reserved name
#define Pointer Pointer is not a reserved name
#define Policy Policy is not a reserved name
#define Pred Pred is not a reserved name
#define Ptr Ptr is not a reserved name
#define Reference Reference is not a reserved name
#define Seq Seq is not a reserved name
#define Seq_RAIter Seq_RAIter is not a reserved name
#define Series Series is not a reserved name
#define Set Set is not a reserved name
#define String String is not a reserved name
#define Tp Tp is not a reserved name
#define Traits Traits is not a reserved name
#define Type Type is not a reserved name
#define Value Value is not a reserved name
#define ValueT ValueT is not a reserved name
#define ValueType ValueType is not a reserved name
#ifdef _AIX #ifdef _AIX
// See https://gcc.gnu.org/ml/libstdc++/2017-03/msg00015.html // See https://gcc.gnu.org/ml/libstdc++/2017-03/msg00015.html
#undef f #undef f
......
// Copyright (C) 2017-2019 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-do compile }
// Define macros for some common variables names that we must not use for
// naming variables, parameters etc. in the library.
#include "../17_intro/names.cc"
// Filesystem
#include <experimental/filesystem>
// Library Fundamentals
#include <experimental/algorithm>
#include <experimental/any>
#include <experimental/array>
#include <experimental/chrono>
#include <experimental/deque>
#include <experimental/forward_list>
#include <experimental/functional>
#include <experimental/iterator>
#include <experimental/list>
#include <experimental/map>
#include <experimental/memory>
#include <experimental/memory_resource>
#include <experimental/numeric>
#include <experimental/optional>
#include <experimental/propagate_const>
#include <experimental/random>
#include <experimental/ratio>
#include <experimental/regex>
#include <experimental/set>
#include <experimental/source_location>
#include <experimental/string>
#include <experimental/string_view>
#include <experimental/system_error>
#include <experimental/tuple>
#include <experimental/type_traits>
#include <experimental/unordered_map>
#include <experimental/unordered_set>
#include <experimental/utility>
#include <experimental/vector>
// Networking
#include <experimental/buffer>
#include <experimental/internet>
#include <experimental/io_context>
#include <experimental/net>
#include <experimental/netfwd>
#include <experimental/socket>
#include <experimental/timer>
#include <experimental/executor>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment