From c69cc95a71d90e3c403d1db77d02eef851b6b6e0 Mon Sep 17 00:00:00 2001
From: timsong-cpp <rs2740@gmail.com>
Date: Wed, 5 Nov 2025 17:42:00 -1000
Subject: [PATCH] Update PR for 4260

---
 xml/issue4260.xml | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/xml/issue4260.xml b/xml/issue4260.xml
index befe333949..8fcf90e51f 100644
--- a/xml/issue4260.xml
+++ b/xml/issue4260.xml
@@ -30,9 +30,7 @@ If we want to mandate nothrow construction
 (a.k.a the implementation isn't out to get you),
 I'd rather we do it for all CPOs."
 </p>
-</discussion>
-
-<resolution>
+<superseded>
 <p>
 This wording is relative to <paper num="N5008"/>.
 </p>
@@ -53,6 +51,40 @@ A query imposes syntactic and semantic requirements on its invocations.
 </blockquote>
 </li>
 </ol>
+</superseded>
+
+<note>2025-11-05; Tim provides improved wording</note>
+<p>
+LWG decided to guarantee some additional properties for CPOs.
+</p>
+</discussion>
+
+<resolution>
+<p>
+This wording is relative to <paper num="N5014"/>.
+</p>
+<ol>
+
+<li><p>Modify <sref ref="[customization.point.object]"/> as indicated:</p>
+
+<blockquote>
+<p>
+-1- A <i>customization point object</i> is a function object (<sref ref="[function.objects]"/>)
+with a literal class type that interacts with program-defined types 
+while enforcing semantic requirements on that interaction.
+</p>
+<p>
+-2- The type of a customization point object, ignoring cv-qualifiers, 
+shall model `semiregular` (<sref ref="[concepts.object]"/>) 
+<ins>and shall be a structural type (<sref ref="[temp.param]"/>) 
+and a trivially copyable type (<sref ref="[class.prop]"/>)</ins>. 
+<ins>Every constructor of this type
+shall have a non-throwing exception specification (<sref ref="[except.spec]"/>).</ins>
+</p>
+</blockquote>
+</li>
+</ol>
+
 </resolution>
 
 </issue>