From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id EFA343852C4F; Mon, 12 Dec 2022 14:01:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EFA343852C4F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670853660; bh=TBD3eStRzjKRHD/IM87RkMID6J9rnh0E8R04jxn1tlg=; h=From:To:Subject:Date:From; b=Ur2mbXdjtSrrgi7jzjoK+IvohrK9dzUmTMyjnPhmTm5CNTld8hbzaul4yH086b8fJ TQHa1N0c/XPODzACAea64uQyt6FPFQZ1Qbe8ry7eaEHZzxUc2n0ikofFPFsS5OEzIt oaB6/5pHIyADBAgeTjqnXjdAL+D76lJTn4ZdwCCY= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-4613] libstdc++: Change names that clash with Win32 or Clang X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 320ac807da125e6dc952b3d4abf02daeead88d44 X-Git-Newrev: cb363fd9f19eb791e1ee1eb0d5c61f5fdf21af32 Message-Id: <20221212140100.EFA343852C4F@sourceware.org> Date: Mon, 12 Dec 2022 14:01:00 +0000 (GMT) List-Id: https://gcc.gnu.org/g:cb363fd9f19eb791e1ee1eb0d5c61f5fdf21af32 commit r13-4613-gcb363fd9f19eb791e1ee1eb0d5c61f5fdf21af32 Author: Jonathan Wakely Date: Mon Dec 12 11:22:45 2022 +0000 libstdc++: Change names that clash with Win32 or Clang 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. Diff: --- libstdc++-v3/include/std/chrono | 6 +++--- libstdc++-v3/include/std/format | 8 ++++---- libstdc++-v3/testsuite/17_intro/names.cc | 11 +++++++++++ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/libstdc++-v3/include/std/chrono b/libstdc++-v3/include/std/chrono index 38ecd3142bc..4c5fbfaeb83 100644 --- a/libstdc++-v3/include/std/chrono +++ b/libstdc++-v3/include/std/chrono @@ -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_unsigned>; diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index 1072e2c17db..269f8f6cc6a 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -3345,10 +3345,10 @@ namespace __format : _M_args(__args), _M_out(std::move(__out)), _M_loc(__loc) { } - template - friend _Out_ - __format::__do_vformat_to(_Out_, basic_string_view<_CharT_>, - const basic_format_args<_Context_>&, + template + friend _Out2 + __format::__do_vformat_to(_Out2, basic_string_view<_CharT2>, + const basic_format_args<_Context2>&, const locale*); public: diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc index 963f74c11f3..16c104a438d 100644 --- a/libstdc++-v3/testsuite/17_intro/names.cc +++ b/libstdc++-v3/testsuite/17_intro/names.cc @@ -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