From patchwork Wed Nov 16 21:00:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 60717 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3B0363986422 for ; Wed, 16 Nov 2022 21:00:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3B0363986422 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1668632443; bh=zj9TwD7SL7HWDIeZPMkmaw7R6kCi7AGlWbXlVwntaNM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=gZHHAvzIzRPfM71Sd2d8M8OYGyCkhcmnI53JhcJ067xOBHiFU6WIMvcdj+bzM5S15 yLup/cneesra2IYDKlRHZzf4A86qzxNSeT27w/P9f1zABITNn9znC7PD1PRYa1Q88s /HiHFequzARN/vmHW6AbgzUKgG098jvLjtAB3qt0= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 8E3CB396E475 for ; Wed, 16 Nov 2022 21:00:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8E3CB396E475 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-15-ycxfIicpMm2rSEJxQIg8EA-1; Wed, 16 Nov 2022 16:00:09 -0500 X-MC-Unique: ycxfIicpMm2rSEJxQIg8EA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4CF75811E67; Wed, 16 Nov 2022 21:00:09 +0000 (UTC) Received: from localhost (unknown [10.33.36.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 16D6F2166B29; Wed, 16 Nov 2022 21:00:08 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Adjust for Clang compatibility [PR107712] Date: Wed, 16 Nov 2022 21:00:06 +0000 Message-Id: <20221116210006.1420105-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Tested x86_64-linux. Pushed to trunk. -- >8 -- Clang doesn't define __builtin_toupper, so use std::toupper. Also add some (not actually required since C++20) typename keywords to help Clang versions up to and including 15. libstdc++-v3/ChangeLog: PR libstdc++/107712 * include/std/format (__format::__formatter_int::format): Use std::toupper when __builtin_toupper isn't available. (basic_format_arg::handle): Add 'typename'. * include/std/complex (complex): Add 'typename'. --- libstdc++-v3/include/std/complex | 2 +- libstdc++-v3/include/std/format | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/std/complex b/libstdc++-v3/include/std/complex index 7fed8a7757c..86d5ca3c3e1 100644 --- a/libstdc++-v3/include/std/complex +++ b/libstdc++-v3/include/std/complex @@ -1840,7 +1840,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { public: typedef _Tp value_type; - typedef std::__complex_type<_Tp>::type _ComplexT; + typedef typename std::__complex_type<_Tp>::type _ComplexT; constexpr complex(_ComplexT __z) : _M_value(__z) { } diff --git a/libstdc++-v3/include/std/format b/libstdc++-v3/include/std/format index fb29f7e7835..995b05c2ab2 100644 --- a/libstdc++-v3/include/std/format +++ b/libstdc++-v3/include/std/format @@ -52,6 +52,10 @@ #include // tuple_size_v #include // __int_traits +#if !__has_builtin(__builtin_toupper) +# include +#endif + namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION @@ -1027,7 +1031,11 @@ namespace __format __res = to_chars(__start, __end, __u, 16); if (_M_spec._M_type == _Pres_X) for (auto __p = __start; __p != __res.ptr; ++__p) +#if __has_builtin(__builtin_toupper) *__p = __builtin_toupper(*__p); +#else + *__p = std::toupper(*__p); +#endif break; default: __builtin_unreachable(); @@ -2718,7 +2726,7 @@ namespace __format public: class handle : public __format::_Arg_value<_Context>::_HandleBase { - using _Base = __format::_Arg_value<_Context>::_HandleBase; + using _Base = typename __format::_Arg_value<_Context>::_HandleBase; // Format as const if possible, to reduce instantiations. template