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 | |
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')
-rw-r--r-- | libstdc++-v3/include/bits/fs_ops.h | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/regex_automaton.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/regex_automaton.tcc | 18 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/regex_scanner.tcc | 60 | ||||
-rw-r--r-- | libstdc++-v3/include/experimental/bits/fs_ops.h | 4 | ||||
-rw-r--r-- | libstdc++-v3/include/std/mutex | 8 |
6 files changed, 48 insertions, 48 deletions
diff --git a/libstdc++-v3/include/bits/fs_ops.h b/libstdc++-v3/include/bits/fs_ops.h index 1ae8fe1..e85eb98 100644 --- a/libstdc++-v3/include/bits/fs_ops.h +++ b/libstdc++-v3/include/bits/fs_ops.h @@ -90,8 +90,8 @@ namespace filesystem bool create_directory(const path& __p); bool create_directory(const path& __p, error_code& __ec) noexcept; - bool create_directory(const path& __p, const path& attributes); - bool create_directory(const path& __p, const path& attributes, + bool create_directory(const path& __p, const path& __attributes); + bool create_directory(const path& __p, const path& __attributes, error_code& __ec) noexcept; void create_directory_symlink(const path& __to, const path& __new_symlink); diff --git a/libstdc++-v3/include/bits/regex_automaton.h b/libstdc++-v3/include/bits/regex_automaton.h index 44bde42..1bafaff 100644 --- a/libstdc++-v3/include/bits/regex_automaton.h +++ b/libstdc++-v3/include/bits/regex_automaton.h @@ -110,7 +110,7 @@ namespace __detail #ifdef _GLIBCXX_DEBUG std::ostream& - _M_print(std::ostream& ostr) const; + _M_print(std::ostream& __ostr) const; // Prints graphviz dot commands for state. std::ostream& 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. diff --git a/libstdc++-v3/include/bits/regex_scanner.tcc b/libstdc++-v3/include/bits/regex_scanner.tcc index 2a1745b..8b4d6e2 100644 --- a/libstdc++-v3/include/bits/regex_scanner.tcc +++ b/libstdc++-v3/include/bits/regex_scanner.tcc @@ -484,98 +484,98 @@ namespace __detail template<typename _CharT> std::ostream& _Scanner<_CharT>:: - _M_print(std::ostream& ostr) + _M_print(std::ostream& __ostr) { switch (_M_token) { case _S_token_anychar: - ostr << "any-character\n"; + __ostr << "any-character\n"; break; case _S_token_backref: - ostr << "backref\n"; + __ostr << "backref\n"; break; case _S_token_bracket_begin: - ostr << "bracket-begin\n"; + __ostr << "bracket-begin\n"; break; case _S_token_bracket_neg_begin: - ostr << "bracket-neg-begin\n"; + __ostr << "bracket-neg-begin\n"; break; case _S_token_bracket_end: - ostr << "bracket-end\n"; + __ostr << "bracket-end\n"; break; case _S_token_char_class_name: - ostr << "char-class-name \"" << _M_value << "\"\n"; + __ostr << "char-class-name \"" << _M_value << "\"\n"; break; case _S_token_closure0: - ostr << "closure0\n"; + __ostr << "closure0\n"; break; case _S_token_closure1: - ostr << "closure1\n"; + __ostr << "closure1\n"; break; case _S_token_collsymbol: - ostr << "collsymbol \"" << _M_value << "\"\n"; + __ostr << "collsymbol \"" << _M_value << "\"\n"; break; case _S_token_comma: - ostr << "comma\n"; + __ostr << "comma\n"; break; case _S_token_dup_count: - ostr << "dup count: " << _M_value << "\n"; + __ostr << "dup count: " << _M_value << "\n"; break; case _S_token_eof: - ostr << "EOF\n"; + __ostr << "EOF\n"; break; case _S_token_equiv_class_name: - ostr << "equiv-class-name \"" << _M_value << "\"\n"; + __ostr << "equiv-class-name \"" << _M_value << "\"\n"; break; case _S_token_interval_begin: - ostr << "interval begin\n"; + __ostr << "interval begin\n"; break; case _S_token_interval_end: - ostr << "interval end\n"; + __ostr << "interval end\n"; break; case _S_token_line_begin: - ostr << "line begin\n"; + __ostr << "line begin\n"; break; case _S_token_line_end: - ostr << "line end\n"; + __ostr << "line end\n"; break; case _S_token_opt: - ostr << "opt\n"; + __ostr << "opt\n"; break; case _S_token_or: - ostr << "or\n"; + __ostr << "or\n"; break; case _S_token_ord_char: - ostr << "ordinary character: \"" << _M_value << "\"\n"; + __ostr << "ordinary character: \"" << _M_value << "\"\n"; break; case _S_token_subexpr_begin: - ostr << "subexpr begin\n"; + __ostr << "subexpr begin\n"; break; case _S_token_subexpr_no_group_begin: - ostr << "no grouping subexpr begin\n"; + __ostr << "no grouping subexpr begin\n"; break; case _S_token_subexpr_lookahead_begin: - ostr << "lookahead subexpr begin\n"; + __ostr << "lookahead subexpr begin\n"; break; case _S_token_subexpr_end: - ostr << "subexpr end\n"; + __ostr << "subexpr end\n"; break; case _S_token_unknown: - ostr << "-- unknown token --\n"; + __ostr << "-- unknown token --\n"; break; case _S_token_oct_num: - ostr << "oct number " << _M_value << "\n"; + __ostr << "oct number " << _M_value << "\n"; break; case _S_token_hex_num: - ostr << "hex number " << _M_value << "\n"; + __ostr << "hex number " << _M_value << "\n"; break; case _S_token_quoted_class: - ostr << "quoted class " << "\\" << _M_value << "\n"; + __ostr << "quoted class " << "\\" << _M_value << "\n"; break; default: _GLIBCXX_DEBUG_ASSERT(false); } - return ostr; + return __ostr; } #endif diff --git a/libstdc++-v3/include/experimental/bits/fs_ops.h b/libstdc++-v3/include/experimental/bits/fs_ops.h index e37dc9a..64089e2 100644 --- a/libstdc++-v3/include/experimental/bits/fs_ops.h +++ b/libstdc++-v3/include/experimental/bits/fs_ops.h @@ -98,8 +98,8 @@ inline namespace v1 bool create_directory(const path& __p); bool create_directory(const path& __p, error_code& __ec) noexcept; - bool create_directory(const path& __p, const path& attributes); - bool create_directory(const path& __p, const path& attributes, + bool create_directory(const path& __p, const path& __attributes); + bool create_directory(const path& __p, const path& __attributes, error_code& __ec) noexcept; void create_directory_symlink(const path& __to, const path& __new_symlink); diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex index b9590bb..48fcaa9 100644 --- a/libstdc++-v3/include/std/mutex +++ b/libstdc++-v3/include/std/mutex @@ -288,8 +288,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if _GLIBCXX_USE_PTHREAD_MUTEX_CLOCKLOCK bool - _M_clocklock(clockid_t clockid, const __gthread_time_t& __ts) - { return !pthread_mutex_clocklock(&_M_mutex, clockid, &__ts); } + _M_clocklock(clockid_t __clockid, const __gthread_time_t& __ts) + { return !pthread_mutex_clocklock(&_M_mutex, __clockid, &__ts); } #endif }; @@ -363,8 +363,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #ifdef _GLIBCXX_USE_PTHREAD_MUTEX_CLOCKLOCK bool - _M_clocklock(clockid_t clockid, const __gthread_time_t& __ts) - { return !pthread_mutex_clocklock(&_M_mutex, clockid, &__ts); } + _M_clocklock(clockid_t __clockid, const __gthread_time_t& __ts) + { return !pthread_mutex_clocklock(&_M_mutex, __clockid, &__ts); } #endif }; |