public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r10-11419] libstdc++: Rename __null_terminated to avoid a collision with system headers.
@ 2023-05-21 19:01 Iain D Sandoe
0 siblings, 0 replies; only message in thread
From: Iain D Sandoe @ 2023-05-21 19:01 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:a905ee4924cdd0a70a1029afce07b860f0bc6d8b
commit r10-11419-ga905ee4924cdd0a70a1029afce07b860f0bc6d8b
Author: Iain Sandoe <iain@sandoe.co.uk>
Date: Sun May 21 10:45:25 2023 +0100
libstdc++: Rename __null_terminated to avoid a collision with system headers.
r13-1073-g254e88b3d7e8ab made this change for experimental/bits/fs-path.h.
The change is needed on the 10.x branch for bits/fs-path.h (it is not required
on later branches since this header was reworked).
Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>
libstdc++-v3/ChangeLog:
* include/bits/fs_path.h: Rename __null_terminated to __nul_terminated
to avoid colliding with a macro in Darwin system headers.
Diff:
---
libstdc++-v3/include/bits/fs_path.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libstdc++-v3/include/bits/fs_path.h b/libstdc++-v3/include/bits/fs_path.h
index 9f0f2bf5d2d..9c7838ef9df 100644
--- a/libstdc++-v3/include/bits/fs_path.h
+++ b/libstdc++-v3/include/bits/fs_path.h
@@ -130,10 +130,10 @@ namespace __detail
_Source
_S_range_begin(_Source __begin) { return __begin; }
- struct __null_terminated { };
+ struct __nul_terminated { };
template<typename _Source>
- __null_terminated
+ __nul_terminated
_S_range_end(_Source) { return {}; }
template<typename _CharT, typename _Traits, typename _Alloc>
@@ -528,11 +528,11 @@ namespace __detail
struct _Cvt;
static basic_string_view<value_type>
- _S_convert(value_type* __src, __detail::__null_terminated)
+ _S_convert(value_type* __src, __detail::__nul_terminated)
{ return __src; }
static basic_string_view<value_type>
- _S_convert(const value_type* __src, __detail::__null_terminated)
+ _S_convert(const value_type* __src, __detail::__nul_terminated)
{ return __src; }
static basic_string_view<value_type>
@@ -554,7 +554,7 @@ namespace __detail
template<typename _InputIterator>
static string_type
- _S_convert(_InputIterator __src, __detail::__null_terminated)
+ _S_convert(_InputIterator __src, __detail::__nul_terminated)
{
// Read from iterator into basic_string until a null value is seen:
auto __s = _S_string_from_iter(__src);
@@ -576,7 +576,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);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-05-21 19:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-21 19:01 [gcc r10-11419] libstdc++: Rename __null_terminated to avoid a collision with system headers Iain D Sandoe
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).