public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Giuliano Belinassi <giulianob@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/autopar_devel] libstdc++: Remove incorrect static specifiers Date: Sat, 22 Aug 2020 21:31:45 +0000 (GMT) [thread overview] Message-ID: <20200822213145.01BAF3861936@sourceware.org> (raw) https://gcc.gnu.org/g:bd2290e0849408b04c48f3c26e6c6d9e1f5fe0b9 commit bd2290e0849408b04c48f3c26e6c6d9e1f5fe0b9 Author: Jonathan Wakely <jwakely@redhat.com> Date: Sat May 23 09:00:16 2020 +0100 libstdc++: Remove incorrect static specifiers These functions were originally static members of the path class, but the 'static' specifiers were not removed when they were moved to namespace scope. This causes ODR violations when the functions are called from functions defined in the header, which is incompatible with Nathan's modules branch. Change them to 'inline' instead. * include/bits/fs_path.h (__detail::_S_range_begin) (__detail::_S_range_end): Remove unintentional static specifiers. * include/experimental/bits/fs_path.h (__detail::_S_range_begin) (__detail::_S_range_end): Likewise. Diff: --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/fs_path.h | 12 ++++++------ libstdc++-v3/include/experimental/bits/fs_path.h | 12 ++++++------ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b82479f0ed6..af52f143be8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2020-05-23 Jonathan Wakely <jwakely@redhat.com> + * include/bits/fs_path.h (__detail::_S_range_begin) + (__detail::_S_range_end): Remove unintentional static specifiers. + * include/experimental/bits/fs_path.h (__detail::_S_range_begin) + (__detail::_S_range_end): Likewise. + * include/bits/fs_path.h (filesystem::__detail::__is_encoded_char): Replace alias template with variable template. Don't remove const. (filesystem::__detail::__is_path_src): Replace overloaded function diff --git a/libstdc++-v3/include/bits/fs_path.h b/libstdc++-v3/include/bits/fs_path.h index 5a998284a99..818b5918927 100644 --- a/libstdc++-v3/include/bits/fs_path.h +++ b/libstdc++-v3/include/bits/fs_path.h @@ -156,32 +156,32 @@ namespace __detail using _Path2 = enable_if_t<__is_path_iter_src<_Tr>::value, path>; template<typename _Source> - static _Source + _Source _S_range_begin(_Source __begin) { return __begin; } struct __null_terminated { }; template<typename _Source> - static __null_terminated + __null_terminated _S_range_end(_Source) { return {}; } template<typename _CharT, typename _Traits, typename _Alloc> - static const _CharT* + inline const _CharT* _S_range_begin(const basic_string<_CharT, _Traits, _Alloc>& __str) { return __str.data(); } template<typename _CharT, typename _Traits, typename _Alloc> - static const _CharT* + inline const _CharT* _S_range_end(const basic_string<_CharT, _Traits, _Alloc>& __str) { return __str.data() + __str.size(); } template<typename _CharT, typename _Traits> - static const _CharT* + inline const _CharT* _S_range_begin(const basic_string_view<_CharT, _Traits>& __str) { return __str.data(); } template<typename _CharT, typename _Traits> - static const _CharT* + inline const _CharT* _S_range_end(const basic_string_view<_CharT, _Traits>& __str) { return __str.data() + __str.size(); } diff --git a/libstdc++-v3/include/experimental/bits/fs_path.h b/libstdc++-v3/include/experimental/bits/fs_path.h index d7234c08a00..69b823a3466 100644 --- a/libstdc++-v3/include/experimental/bits/fs_path.h +++ b/libstdc++-v3/include/experimental/bits/fs_path.h @@ -137,33 +137,33 @@ namespace __detail path>::type; template<typename _Source> - static _Source + inline _Source _S_range_begin(_Source __begin) { return __begin; } struct __null_terminated { }; template<typename _Source> - static __null_terminated + inline __null_terminated _S_range_end(_Source) { return {}; } template<typename _CharT, typename _Traits, typename _Alloc> - static const _CharT* + inline const _CharT* _S_range_begin(const basic_string<_CharT, _Traits, _Alloc>& __str) { return __str.data(); } template<typename _CharT, typename _Traits, typename _Alloc> - static const _CharT* + inline const _CharT* _S_range_end(const basic_string<_CharT, _Traits, _Alloc>& __str) { return __str.data() + __str.size(); } #if __cplusplus >= 201402L template<typename _CharT, typename _Traits> - static const _CharT* + inline const _CharT* _S_range_begin(const basic_string_view<_CharT, _Traits>& __str) { return __str.data(); } template<typename _CharT, typename _Traits> - static const _CharT* + inline const _CharT* _S_range_end(const basic_string_view<_CharT, _Traits>& __str) { return __str.data() + __str.size(); } #endif
reply other threads:[~2020-08-22 21:31 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200822213145.01BAF3861936@sourceware.org \ --to=giulianob@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ --cc=libstdc++-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).