From 1351054b7d1de7912daf47ee4f03ca38d5ad343e Mon Sep 17 00:00:00 2001 From: Jan Schultke Date: Wed, 10 Sep 2025 11:11:30 +0200 Subject: [PATCH] [optional.optional.general], [optional.optional.ref.general] Use "object of type optional" correctly --- source/utilities.tex | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/source/utilities.tex b/source/utilities.tex index 5087bc7290..60e2f2f5ba 100644 --- a/source/utilities.tex +++ b/source/utilities.tex @@ -3365,8 +3365,10 @@ \end{codeblock} \pnum -Any instance of \tcode{optional} at any given time either contains a value or does not contain a value. -When an instance of \tcode{optional} \defnx{contains a value}{contains a value!\idxcode{optional}}, +An object of type \tcode{optional} at any given time +either contains a value or does not contain a value. +When an object of type \tcode{optional} +\defnx{contains a value}{contains a value!\idxcode{optional}}, it means that an object of type \tcode{T}, referred to as the optional object's \defnx{contained value}{contained value!\idxcode{optional}}, is nested within\iref{intro.object} the optional object. When an object of type \tcode{optional} is contextually converted to \tcode{bool}, @@ -3374,7 +3376,7 @@ otherwise the conversion returns \tcode{false}. \pnum -When an \tcode{optional} object contains a value, +When an object of type \tcode{optional} contains a value, member \tcode{val} points to the contained value. \pnum @@ -4517,7 +4519,7 @@ \end{codeblock} \pnum -An object of \tcode{optional} +An object of type \tcode{optional} \defnx{contains a value}{contains a value!\idxcode{optional.ref}} if and only if \tcode{\exposidnc{val} != nullptr} is \tcode{true}. When an \tcode{optional} contains a value,