diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2023-02-10 23:16:15 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2024-06-11 13:35:08 +0100 |
| commit | 4d257dac0adecc7ce6b1b871cd5e99ae75f0688f (patch) | |
| tree | cc4c580977b090656597a7a87afd40fc7d7299f9 /libstdc++-v3/include/bits/regex_automaton.tcc | |
| parent | 5f885bd5f435ea05ad18d28860b3f22c7705d967 (diff) | |
| download | gcc-4d257dac0adecc7ce6b1b871cd5e99ae75f0688f.zip gcc-4d257dac0adecc7ce6b1b871cd5e99ae75f0688f.tar.gz gcc-4d257dac0adecc7ce6b1b871cd5e99ae75f0688f.tar.bz2 | |
libstdc++: Fix uses of non-reserved names in headers
The non-reserved names 'val' and 'dest' were being used in our headers
but haven't been added to the 17_intro/names.cc test. That's because
they are used by <asm-generic/posix_types.h> and <netinet/tcp.h>
respecitvely on glibc-based systems.
libstdc++-v3/ChangeLog:
* include/bits/fs_ops.h (create_directory): Use reserved name
for parameter.
* include/bits/regex_automaton.h (_State_base::_M_print):
Likewise.
* include/bits/regex_automaton.tcc(_State_base::_M_print):
Likewise.
* include/bits/regex_scanner.tcc(_Scanner::_M_print): Likewise.
* include/experimental/bits/fs_ops.h (create_directory):
Likewise.
* include/std/mutex (timed_mutex::_M_clocklock): Likewise.
(recursive_timed_mutex:_M_clocklock): Likewise.
* libsupc++/cxxabi_init_exception.h
(__cxa_init_primary_exception): Likewise.
* testsuite/17_intro/names.cc: Add checks.
(cherry picked from commit dc79eba72b4d16180e500eba336f511a485a8496)
Diffstat (limited to 'libstdc++-v3/include/bits/regex_automaton.tcc')
| -rw-r--r-- | libstdc++-v3/include/bits/regex_automaton.tcc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libstdc++-v3/include/bits/regex_automaton.tcc b/libstdc++-v3/include/bits/regex_automaton.tcc index caaf3c4..bce378f 100644 --- a/libstdc++-v3/include/bits/regex_automaton.tcc +++ b/libstdc++-v3/include/bits/regex_automaton.tcc @@ -36,34 +36,34 @@ namespace __detail { #ifdef _GLIBCXX_DEBUG inline std::ostream& - _State_base::_M_print(std::ostream& ostr) const + _State_base::_M_print(std::ostream& __ostr) const { switch (_M_opcode) { case _S_opcode_alternative: case _S_opcode_repeat: - ostr << "alt next=" << _M_next << " alt=" << _M_alt; + __ostr << "alt next=" << _M_next << " alt=" << _M_alt; break; case _S_opcode_subexpr_begin: - ostr << "subexpr begin next=" << _M_next << " index=" << _M_subexpr; + __ostr << "subexpr begin next=" << _M_next << " index=" << _M_subexpr; break; case _S_opcode_subexpr_end: - ostr << "subexpr end next=" << _M_next << " index=" << _M_subexpr; + __ostr << "subexpr end next=" << _M_next << " index=" << _M_subexpr; break; case _S_opcode_backref: - ostr << "backref next=" << _M_next << " index=" << _M_backref_index; + __ostr << "backref next=" << _M_next << " index=" << _M_backref_index; break; case _S_opcode_match: - ostr << "match next=" << _M_next; + __ostr << "match next=" << _M_next; break; case _S_opcode_accept: - ostr << "accept next=" << _M_next; + __ostr << "accept next=" << _M_next; break; default: - ostr << "unknown next=" << _M_next; + __ostr << "unknown next=" << _M_next; break; } - return ostr; + return __ostr; } // Prints graphviz dot commands for state. |