Skip to content

Commit 5bfee12

Browse files
committed
Starting r2
1 parent 299deec commit 5bfee12

File tree

3 files changed

+1428
-3
lines changed

3 files changed

+1428
-3
lines changed

3491_define_static/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
p3491r1.html : define-static.md
1+
p3491r2.html : define-static.md
22
include ../md/mpark-wg21.mk

3491_define_static/define-static.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "`define_static_{string,object,array}`"
3-
document: P3491R1
3+
document: P3491R2
44
date: today
55
audience: LEWG
66
author:
@@ -483,7 +483,10 @@ Add to [meta.syn]{.sref}:
483483
namespace std {
484484
+ // [meta.string.literal], checking string literals
485485
+ consteval bool is_string_literal(const char* p);
486+
+ consteval bool is_string_literal(const wchar_t* p);
486487
+ consteval bool is_string_literal(const char8_t* p);
488+
+ consteval bool is_string_literal(const char16_t* p);
489+
+ consteval bool is_string_literal(const char32_t* p);
487490

488491
+ // [meta.define.static], promoting to runtime storage
489492
+ template <ranges::input_range R>
@@ -526,7 +529,7 @@ consteval const ranges::range_value_t<R>* define_static_string(R&& r);
526529

527530
[#]{.pnum} Let `$CharT$` be `ranges::range_value_t<R>`.
528531

529-
[#]{.pnum} *Mandates*: `$CharT$` is either `char` or `char8_t`.
532+
[#]{.pnum} *Mandates*: `$CharT$` is one of `char`, `wchar_t`, `char8_t`, `char16_t`, or `char32_t`.
530533

531534
[#]{.pnum} Let `$V$` be the pack of elements of type `$CharT$` in `r`. If `r` is a string literal, then `$V$` does not include the trailing null terminator of `r`.
532535

0 commit comments

Comments
 (0)