[gcc r10-10558] libstdc++: Fix non-reserved name in <regex> header

[gcc r10-10558] libstdc++: Fix non-reserved name in <regex> header

[Jonathan Wakely]

https://gcc.gnu.org/g:b072b2f85aaa3f6d27c706b80f521335c675f63e

commit r10-10558-gb072b2f85aaa3f6d27c706b80f521335c675f63e
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Mon Dec 13 13:36:33 2021 +0000

    libstdc++: Fix non-reserved name in <regex> header
    
    libstdc++-v3/ChangeLog:
    
            * include/bits/regex_compiler.tcc (_Compiler::_M_match_token):
            Use reserved name for parameter.
            * testsuite/17_intro/names.cc: Check "token".
    
    (cherry picked from commit b0e6a257f1862e217cdf19332ea0f7bad56dcddc)

Diff:
---
 libstdc++-v3/include/bits/regex_compiler.tcc | 4 ++--
 libstdc++-v3/testsuite/17_intro/names.cc     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/include/bits/regex_compiler.tcc b/libstdc++-v3/include/bits/regex_compiler.tcc
index 2ae4af02c89..d29a0537283 100644
--- a/libstdc++-v3/include/bits/regex_compiler.tcc
+++ b/libstdc++-v3/include/bits/regex_compiler.tcc
@@ -586,9 +586,9 @@ namespace __detail
   template<typename _TraitsT>
     bool
     _Compiler<_TraitsT>::
-    _M_match_token(_TokenT token)
+    _M_match_token(_TokenT __token)
     {
-      if (token == _M_scanner._M_get_token())
+      if (__token == _M_scanner._M_get_token())
 	{
 	  _M_value = _M_scanner._M_get_value();
 	  _M_scanner._M_advance();
diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index 7d3960e3843..f60c70ef561 100644
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -107,6 +107,7 @@
 
 #define tmp (
 #define sz (
+#define token (
 
 #if __cplusplus < 201103L
 #define uses_allocator  (