From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 22F213858C54; Fri, 21 Oct 2022 01:23:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 22F213858C54 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666315432; bh=nrzu99VjwN63FNIsu0WGX1m7lW6zOJ6QvkRxYWOXIuY=; h=From:To:Subject:Date:From; b=xG/+Du5Z8ga063BpBoKtMWPd20gtRihrnVOYvY+DadJ3JzpBgltpqQsEgYJLHvF9T lT6h1+Y5EjpWwQVfeWfgAqmAbTjyMhjrzpO54BI2awXQB+iZSvBfTSfzRVhO7po55s 0PKf2Jo/OBsKqbmvNAEfNgFI/BuNQ8p9U+SqTJw0= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jason Merrill To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/c++-contracts] c++: comments X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/devel/c++-contracts X-Git-Oldrev: fcce3a45f0c6625dcc45dc7d83fdb1b836016bbe X-Git-Newrev: b141fc304e150b643a7e697881490cbc643cbf0e Message-Id: <20221021012352.22F213858C54@sourceware.org> Date: Fri, 21 Oct 2022 01:23:51 +0000 (GMT) List-Id: https://gcc.gnu.org/g:b141fc304e150b643a7e697881490cbc643cbf0e commit b141fc304e150b643a7e697881490cbc643cbf0e Author: Jason Merrill Date: Tue Oct 18 17:08:51 2022 -0400 c++: comments gcc/cp/ChangeLog: * contracts.h (enum contract_continuation): Add comment. libstdc++-v3/ChangeLog: * include/experimental/contract: Add comments. Diff: --- gcc/cp/contracts.h | 1 + libstdc++-v3/include/experimental/contract | 3 +++ 2 files changed, 4 insertions(+) diff --git a/gcc/cp/contracts.h b/gcc/cp/contracts.h index cf1890510b8..81b528397bc 100644 --- a/gcc/cp/contracts.h +++ b/gcc/cp/contracts.h @@ -59,6 +59,7 @@ checked_contract_p (contract_semantic cs) return cs >= CCS_NEVER; } +/* Must match std::contract_violation_continuation_mode in . */ enum contract_continuation { NEVER_CONTINUE, diff --git a/libstdc++-v3/include/experimental/contract b/libstdc++-v3/include/experimental/contract index 8d49bf751da..a52c2a485cf 100644 --- a/libstdc++-v3/include/experimental/contract +++ b/libstdc++-v3/include/experimental/contract @@ -45,6 +45,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION + // From P1332 enum class contract_violation_continuation_mode { NEVER_CONTINUE, MAYBE_CONTINUE }; @@ -63,11 +64,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION contract_violation_continuation_mode __m) : _M_line(__l), _M_file(__f), _M_function(__fn), _M_comment(__c), _M_level(__lv), _M_role(__r), _M_continue(__m) { } + // From N4820 uint_least32_t line_number() const noexcept { return _M_line; } string_view file_name() const noexcept { return _M_file; } string_view function_name() const noexcept { return _M_function; } string_view comment() const noexcept { return _M_comment; } string_view assertion_level() const noexcept { return _M_level; } + // From P1332 string_view assertion_role() const noexcept { return _M_role; } contract_violation_continuation_mode continuation_mode() const noexcept { return _M_continue; }