From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from omta38.uswest2.a.cloudfilter.net (omta38.uswest2.a.cloudfilter.net [35.89.44.37]) by sourceware.org (Postfix) with ESMTPS id 958863858CDA for ; Tue, 21 Nov 2023 15:28:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 958863858CDA Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 958863858CDA Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.37 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700580496; cv=none; b=ReVbosXJrUdCcfvlXIrRguu2SFz8jfslwChlEly3bLOyGSdXXTs8GtRq9Cf0nJm6Ubt+v/mkmAk8BSefCL8F6YAgGe+ukUbRHJroo+V4DPX89gnl3zvQZjeL0TvH7g4s0ENsXlcWGwL9vvPqQtjeX428aboVO9mxjIn25lj1aZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700580496; c=relaxed/simple; bh=ORZyWie90PdVcfvY4fLnIUhoCon2YRHckP0PDj6uY/A=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=HgTvl303DusRnjY7NIsBSrdGvlpAxhnWXm6FYZs0gmWBhJYNBBdPD7rke8wvwAWsvYAu4wHfZopJRFx4mhK/bRAbOIBVA2t16mhjRC+NjPhkqW1awSQa0rk/nnQpYRVHimMySo/ofBg/yCi5q3Xrgj6skLlTDrEDIgJb3rzAxmA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5006a.ext.cloudfilter.net ([10.0.29.179]) by cmsmtp with ESMTPS id 5Bpmr7yh5KOkL5SfdrYGzD; Tue, 21 Nov 2023 15:28:13 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id 5Sfcry7lN1J285SfdrZyMQ; Tue, 21 Nov 2023 15:28:13 +0000 X-Authority-Analysis: v=2.4 cv=Tqz1ORbh c=1 sm=1 tr=0 ts=655ccc8d a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=OWjo9vPv0XrRhIrVQ50Ab3nP57M=:19 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=BNY50KLci1gA:10 a=Qbun_eYptAEA:10 a=T_Alst9gAAAA:8 a=6K-99XNBvaN-ywHE-TcA:9 a=DvZ5ixILWSEuw56YIEpp:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:Reply-To:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Content-Type:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe :List-Post:List-Owner:List-Archive; bh=cXgux57eM1bRUpvneLmNIo8SiedzcOAE+V0eKIdLQ/8=; b=stU/DPvOEpQo9kIlKfzUs6pizm wsJdohwXKZuyqHPjZUcW2M3IKzX0+OIwp9wRZe0xrK/QcdbcHZbe/FdWY89mQpqdE67aK1Pin+qog +IzFWAsKozd3N8gSQ9QzJNhE+; Received: from 97-122-77-73.hlrn.qwest.net ([97.122.77.73]:36894 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1r5Sfc-004BpE-1F; Tue, 21 Nov 2023 08:28:12 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey , Pedro Alves Subject: [PATCH v2 3/8] Enable some C++14 code in array-view.h Date: Tue, 21 Nov 2023 08:27:30 -0700 Message-ID: <20231121152817.31859-4-tom@tromey.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231121152817.31859-1-tom@tromey.com> References: <20231121152817.31859-1-tom@tromey.com> Reply-To: [PATCH v2 0/8] More C++17 conversions MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.77.73 X-Source-L: No X-Exim-ID: 1r5Sfc-004BpE-1F X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-77-73.hlrn.qwest.net (localhost.localdomain) [97.122.77.73]:36894 X-Source-Auth: tom+tromey.com X-Email-Count: 9 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfPmeqQrlw5Ij7abK4G2s6sYlbyfU3wNR6tCuW/2avtWf3ERUJHganaactGdGvw3i2cRB9/y1DE7j18qhxFV2kBfbUU8fkvQluyZQnSEoDtLkW8WwsuVt DfUJ2TU5QgPzpQ/D1Lh5XxTuZPZEzFZZtoD7g/9H2LNQz8K+iuscDyFc4k6SwCFQcw9d+sQ0yqwS6Q1Y93bIFtL4WGp6YpP7PCg= X-Spam-Status: No, score=-3024.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This changes gdbsupport/array-view.h to enable some code that is C++14-specific. Approved-By: Pedro Alves --- gdbsupport/array-view.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/gdbsupport/array-view.h b/gdbsupport/array-view.h index 4b519112e78..0417f9e80a0 100644 --- a/gdbsupport/array-view.h +++ b/gdbsupport/array-view.h @@ -153,18 +153,17 @@ class array_view : m_array (c.data ()), m_size (c.size ()) {} - /* Observer methods. Some of these can't be constexpr until we - require C++14. */ - /*constexpr14*/ T *data () noexcept { return m_array; } + /* Observer methods. */ + constexpr T *data () noexcept { return m_array; } constexpr const T *data () const noexcept { return m_array; } - /*constexpr14*/ T *begin () noexcept { return m_array; } + constexpr T *begin () noexcept { return m_array; } constexpr const T *begin () const noexcept { return m_array; } - /*constexpr14*/ T *end () noexcept { return m_array + m_size; } + constexpr T *end () noexcept { return m_array + m_size; } constexpr const T *end () const noexcept { return m_array + m_size; } - /*constexpr14*/ reference operator[] (size_t index) noexcept + constexpr reference operator[] (size_t index) noexcept { #if defined(_GLIBCXX_DEBUG) gdb_assert (index < m_size); @@ -173,7 +172,7 @@ class array_view } constexpr const_reference operator[] (size_t index) const noexcept { -#if defined(_GLIBCXX_DEBUG) && __cplusplus >= 201402L +#if defined(_GLIBCXX_DEBUG) gdb_assert (index < m_size); #endif return m_array[index]; @@ -188,7 +187,7 @@ class array_view [[nodiscard]] constexpr array_view slice (size_type start, size_type size) const noexcept { -#if defined(_GLIBCXX_DEBUG) && __cplusplus >= 201402L +#if defined(_GLIBCXX_DEBUG) gdb_assert (start + size <= m_size); #endif return {m_array + start, size}; @@ -199,7 +198,7 @@ class array_view [[nodiscard]] constexpr array_view slice (size_type start) const noexcept { -#if defined(_GLIBCXX_DEBUG) && __cplusplus >= 201402L +#if defined(_GLIBCXX_DEBUG) gdb_assert (start <= m_size); #endif return {m_array + start, size () - start}; -- 2.41.0