mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-27 19:24:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

libstdc++: Change names that clash with Win32 or Clang

Browse Source 
Clang now defines an __is_unsigned built-in, and Windows defines an
_Out_ macro. Replace uses of those as identifiers.

There might also be a problem with __is_signed, which we use in several
places.

libstdc++-v3/ChangeLog:

	* include/std/chrono (hh_mm_ss): Rename __is_unsigned member to
	_S_is_unsigned.
	* include/std/format (basic_format_context): Rename _Out_
	template parameter to _Out2.
	* testsuite/17_intro/names.cc: Add Windows SAL annotation
	macros.
This commit is contained in:
Jonathan Wakely 2022-12-12 11:22:45 +00:00
parent 320ac807da
commit cb363fd9f1
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/include/std/chrono
View File

@ -2344,7 +2344,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
constexpr bool
is_negative() const noexcept
{
if constexpr (!__is_unsigned)
if constexpr (!_S_is_unsigned)
return _M_is_neg;
else
return false;
@ -2373,7 +2373,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
constexpr precision
to_duration() const noexcept
{
if constexpr (!__is_unsigned)
if constexpr (!_S_is_unsigned)
if (_M_is_neg)
return -(_M_h + _M_m + _M_s + subseconds());
return _M_h + _M_m + _M_s + subseconds();
@ -2382,7 +2382,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// TODO: Implement operator<<.
private:
static constexpr bool __is_unsigned
static constexpr bool _S_is_unsigned
= __and_v<is_integral<typename _Duration::rep>,
is_unsigned<typename _Duration::rep>>;

8
libstdc++-v3/include/std/format
View File

@ -3345,10 +3345,10 @@ namespace __format
: _M_args(__args), _M_out(std::move(__out)), _M_loc(__loc)
{ }
template<typename _Out_, typename _CharT_, typename _Context_>
friend _Out_
__format::__do_vformat_to(_Out_, basic_string_view<_CharT_>,
const basic_format_args<_Context_>&,
template<typename _Out2, typename _CharT2, typename _Context2>
friend _Out2
__format::__do_vformat_to(_Out2, basic_string_view<_CharT2>,
const basic_format_args<_Context2>&,
const locale*);
public:

11
libstdc++-v3/testsuite/17_intro/names.cc
View File

@ -205,6 +205,17 @@
#define ValueT ValueT is not a reserved name
#define ValueType ValueType is not a reserved name
#ifndef _WIN32
// Windows SAL annotations
#define _In_ cannot be used as an identifier
#define _Inout_ cannot be used as an identifier
#define _Out_ cannot be used as an identifier
#define _Reserved_ cannot be used as an identifier
#define __inout cannot be used as an identifier
#define __in_opt cannot be used as an identifier
#define __out_opt cannot be used as an identifier
#endif
#ifdef _AIX
// See https://gcc.gnu.org/ml/libstdc++/2017-03/msg00015.html
#undef f