diff options
| author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-03-02 03:43:49 +0000 |
|---|---|---|
| committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-03-02 03:43:49 +0000 |
| commit | 6cb28338444b8007b248d3d722fde08b8777f093 (patch) | |
| tree | 69e9081d4292ab46de3188a521dfa8e52e686b73 /libstdc++-v3/libsupc++ | |
| parent | 31ab13fe142079260dff23ae1a86dc4af1f71f74 (diff) | |
| download | gcc-6cb28338444b8007b248d3d722fde08b8777f093.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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@245828 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/libsupc++')
| -rw-r--r-- | libstdc++-v3/libsupc++/exception_ptr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/libsupc++/exception_ptr.h b/libstdc++-v3/libsupc++/exception_ptr.h index 2447a5a4639..0ece81d8137 100644 --- a/libstdc++-v3/libsupc++/exception_ptr.h +++ b/libstdc++-v3/libsupc++/exception_ptr.h @@ -168,8 +168,8 @@ namespace std template<typename _Ex> inline void - __dest_thunk(void* x) - { static_cast<_Ex*>(x)->~_Ex(); } + __dest_thunk(void* __x) + { static_cast<_Ex*>(__x)->~_Ex(); } } // namespace __exception_ptr |