From: Mark Mentovai <mark@mentovai.com>
To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org
Cc: Jonathan Wakely <jwakely@redhat.com>, Iain Sandoe <iain@sandoe.co.uk>
Subject: [PATCH] libstdc++: Rename __null_terminated to avoid collision with Apple SDK
Date: Fri, 10 Jun 2022 16:11:45 -0400 [thread overview]
Message-ID: <20220610201145.34747-1-mark@mentovai.com> (raw)
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: Rename __null_terminated
to __nul_terminated avoid colliding with a macro in Apple's SDK.
Signed-off-by: Mark Mentovai <mark@mentovai.com>
---
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 b0825ba76e80..19d246100cb5 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>
@@ -459,11 +459,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>
@@ -477,7 +477,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());
@@ -504,7 +504,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);
--
2.36.1
next reply other threads:[~2022-06-10 20:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-10 20:11 Mark Mentovai [this message]
2022-06-10 21:21 ` Jonathan Wakely
2022-06-10 21:42 ` Mark Mentovai
2022-06-13 19:28 ` Jonathan Wakely
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=20220610201145.34747-1-mark@mentovai.com \
--to=mark@mentovai.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=iain@sandoe.co.uk \
--cc=jwakely@redhat.com \
--cc=libstdc++@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: link
Be 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).