mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-18 08:23:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

libstdc++: Rename __null_terminated to avoid collision with Apple SDK

Browse Source 
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 254e88b3d7)
This commit is contained in:
Mark Mentovai 2022-06-13 16:40:19 +01:00 committed by Jonathan Wakely
parent 4b06b73040
commit d1201dbf55
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libstdc++-v3/include/experimental/bits/fs_path.h
View File

@ -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);