diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2017-03-02 03:43:49 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2017-03-02 03:43:49 +0000 |
| commit | d34d36ef0d85c74884f8f8b0c80d845d3d1bc04f (patch) | |
| tree | 69e9081d4292ab46de3188a521dfa8e52e686b73 /libstdc++-v3/include/bits/regex.h | |
| parent | 5782e3094161376c1679c2e5099445b09cf2bf75 (diff) | |
| download | gcc-d34d36ef0d85c74884f8f8b0c80d845d3d1bc04f.tar.gz | |
PR libstdc++/79789 fix non-reserved names in headers
PR libstdc++/79789
* include/bits/hashtable_policy.h (__clp2): Use reserved names for
parameters and local variables.
* include/bits/ios_base.h (make_error_code, make_error_condition):
Likewise.
* include/bits/list.tcc (list::sort): Likewise.
* include/bits/mask_array.h (mask_array): Likewise.
* include/bits/regex.h (regex_token_iterator): Likewise.
* include/bits/slice_array.h (slice_array): Likewise.
* include/bits/stl_algo.h (__sample): Likewise.
* include/std/memory (undeclare_no_pointers): Likewise.
* include/std/type_traits (is_callable_v, is_nothrow_callable_v):
Likewise.
* libsupc++/exception_ptr.h (__dest_thunk): Likewise.
* testsuite/17_intro/headers/names.cc: New test.
From-SVN: r245828
Diffstat (limited to 'libstdc++-v3/include/bits/regex.h')
| -rw-r--r-- | libstdc++-v3/include/bits/regex.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index 17a1ef47c21..60837ea6cff 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -2674,9 +2674,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 initializer_list<int>, regex_constants::match_flag_type = regex_constants::match_default) = delete; - template <std::size_t N> + template <std::size_t _Nm> regex_token_iterator(_Bi_iter, _Bi_iter, const regex_type&&, - const int (&)[N], + const int (&)[_Nm], regex_constants::match_flag_type = regex_constants::match_default) = delete; |