public inbox for libstdc++-cvs@sourceware.org help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r10-10842] libstdc++: Rename __null_terminated to avoid collision with Apple SDK Date: Wed, 15 Jun 2022 08:15:05 +0000 (GMT) [thread overview] Message-ID: <20220615081505.476DD3856266@sourceware.org> (raw) https://gcc.gnu.org/g:7137ae4051ae71bb7fc7fd59d956952c53403239 commit r10-10842-g7137ae4051ae71bb7fc7fd59d956952c53403239 Author: Mark Mentovai <mark@mentovai.com> Date: Mon Jun 13 16:40:19 2022 +0100 libstdc++: Rename __null_terminated to avoid collision with Apple SDK The macOS 13 SDK (and equivalent-version iOS and other Apple OS SDKs) contain this definition in <sys/cdefs.h>: 863 #define __null_terminated This collides with the use of __null_terminated in libstdc++'s experimental fs_path.h. As libstdc++'s use of this token is entirely internal to fs_path.h, the simplest workaround, renaming it, is most appropriate. Here, it's renamed to __nul_terminated, referencing the NUL ('\0') value that is used to terminate the strings in the context in which this tag structure is used. libstdc++-v3/ChangeLog: * include/experimental/bits/fs_path.h (__detail::__null_terminated): Rename to __nul_terminated to avoid colliding with a macro in Apple's SDK. Signed-off-by: Mark Mentovai <mark@mentovai.com> (cherry picked from commit 254e88b3d7e8abcc236be3451609834371cf4d5d) Diff: --- libstdc++-v3/include/experimental/bits/fs_path.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/include/experimental/bits/fs_path.h b/libstdc++-v3/include/experimental/bits/fs_path.h index 0a8f4eee0a1..11b4ce0fe58 100644 --- a/libstdc++-v3/include/experimental/bits/fs_path.h +++ b/libstdc++-v3/include/experimental/bits/fs_path.h @@ -140,10 +140,10 @@ namespace __detail inline _Source _S_range_begin(_Source __begin) { return __begin; } - struct __null_terminated { }; + struct __nul_terminated { }; template<typename _Source> - inline __null_terminated + inline __nul_terminated _S_range_end(_Source) { return {}; } template<typename _CharT, typename _Traits, typename _Alloc> @@ -467,11 +467,11 @@ namespace __detail struct _Cvt; static string_type - _S_convert(value_type* __src, __detail::__null_terminated) + _S_convert(value_type* __src, __detail::__nul_terminated) { return string_type(__src); } static string_type - _S_convert(const value_type* __src, __detail::__null_terminated) + _S_convert(const value_type* __src, __detail::__nul_terminated) { return string_type(__src); } template<typename _Iter> @@ -485,7 +485,7 @@ namespace __detail template<typename _InputIterator> static string_type - _S_convert(_InputIterator __src, __detail::__null_terminated) + _S_convert(_InputIterator __src, __detail::__nul_terminated) { auto __s = _S_string_from_iter(__src); return _S_convert(__s.c_str(), __s.c_str() + __s.size()); @@ -505,7 +505,7 @@ namespace __detail template<typename _InputIterator> static string_type - _S_convert_loc(_InputIterator __src, __detail::__null_terminated, + _S_convert_loc(_InputIterator __src, __detail::__nul_terminated, const std::locale& __loc) { const std::string __s = _S_string_from_iter(__src);
reply other threads:[~2022-06-15 8:15 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=20220615081505.476DD3856266@sourceware.org \ --to=redi@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).