From 9d52df8b9da721a7cbbd20c670c0f3af6e4d6c1d Mon Sep 17 00:00:00 2001
From: Dawn Perchik <dawn@brightsidecomputing.com>
Date: Thu, 16 Feb 2023 15:38:14 -0800
Subject: [PATCH] P2655R3 common_reference_t of reference_wrapper Should Be a
 Reference Type

[refwrap.common.ref] Enclose code in namespace std for consistency.
---
 source/meta.tex      |  8 +++++---
 source/support.tex   |  2 ++
 source/utilities.tex | 42 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/source/meta.tex b/source/meta.tex
index 90b03b1fbb..917869e651 100644
--- a/source/meta.tex
+++ b/source/meta.tex
@@ -2121,9 +2121,11 @@
 \item Otherwise, if \tcode{sizeof...(T)} is two, let \tcode{T1} and \tcode{T2}
   denote the two types in the pack \tcode{T}. Then
   \begin{itemize}
-  \item If \tcode{T1} and \tcode{T2} are reference types and
-    \tcode{\placeholdernc{COMMON-REF}(T1, T2)} is well-formed, then the member
-    typedef \tcode{type} denotes that type.
+  \item Let \tcode{R} be \tcode{\placeholdernc{COMMON-REF}(T1, T2)}.
+    If \tcode{T1} and \tcode{T2} are reference types,
+    \tcode{R} is well-formed, and
+    \tcode{is_convertible_v<add_pointer_t<T1>, add_pointer_t<R>> \&\& is_convertible_v<add_poin\linebreak{}ter_t<T2>, add_pointer_t<R>>} is \tcode{true},
+    then the member typedef \tcode{type} denotes \tcode{R}.
 
   \item Otherwise, if
     \tcode{basic_common_reference<remove_cvref_t<T1>, remove_cvref_t<T2>,
diff --git a/source/support.tex b/source/support.tex
index a3cfe4057d..8c68f16620 100644
--- a/source/support.tex
+++ b/source/support.tex
@@ -588,6 +588,8 @@
 #define @\defnlibxname{cpp_lib_chrono}@                            201907L // also in \libheader{chrono}
 #define @\defnlibxname{cpp_lib_chrono_udls}@                       201304L // also in \libheader{chrono}
 #define @\defnlibxname{cpp_lib_clamp}@                             201603L // also in \libheader{algorithm}
+#define @\defnlibxname{cpp_lib_common_reference}@                  202302L // also in \libheader{type_traits}
+#define @\defnlibxname{cpp_lib_common_reference_wrapper}@          202302L // also in \libheader{functional}
 #define @\defnlibxname{cpp_lib_complex_udls}@                      201309L // also in \libheader{complex}
 #define @\defnlibxname{cpp_lib_concepts}@                          202207L // also in \libheader{concepts}, \libheader{compare}
 #define @\defnlibxname{cpp_lib_constexpr_algorithms}@              201806L // also in \libheader{algorithm}, \libheader{utility}
diff --git a/source/utilities.tex b/source/utilities.tex
index 1043ee8e9b..0a3004413c 100644
--- a/source/utilities.tex
+++ b/source/utilities.tex
@@ -10453,6 +10453,15 @@
   template<class T>
     constexpr reference_wrapper<const T> cref(reference_wrapper<T>) noexcept;       // freestanding
 
+  // \ref{refwrap.common.ref}, \tcode{common_reference} related specializations
+  template<class R, class T, template<class> class RQual, template<class> class TQual>
+    requires @\seebelow@
+  struct basic_common_reference<R, T, RQual, TQual>;
+
+  template<class T, class R, template<class> class TQual, template<class> class RQual>
+    requires @\seebelow@
+  struct basic_common_reference<T, R, TQual, RQual>;
+
   // \ref{arithmetic.operations}, arithmetic operations
   template<class T = void> struct plus;                                             // freestanding
   template<class T = void> struct minus;                                            // freestanding
@@ -11004,6 +11013,39 @@
 \tcode{t}.
 \end{itemdescr}
 
+\rSec3[refwrap.common.ref]{\tcode{common_reference} related specializations}
+
+\indexlibraryglobal{basic_common_reference}%
+\begin{codeblock}
+namespace std {
+  template<class T>
+    constexpr bool @\exposid{is-ref-wrapper}@ = false;                              // \expos
+
+  template<class T>
+    constexpr bool @\exposid{is-ref-wrapper}@<reference_wrapper<T>> = true;
+
+  template<class R, class T, class RQ, class TQ>
+    concept @\defexposconcept{ref-wrap-common-reference-exists-with}@ =                     // \expos
+      @\exposid{is-ref-wrapper}@<R> &&
+      requires { typename common_reference_t<typename R::type&, TQ>; } &&
+      @\libconcept{convertible_to}@<RQ, common_reference_t<typename R::type&, TQ>>;
+
+  template<class R, class T, template<class> class RQual, template<class> class TQual>
+    requires (@\exposconcept{ref-wrap-common-reference-exists-with}@<R, T, RQual<R>, TQual<T>> &&
+              !@\exposconcept{ref-wrap-common-reference-exists-with}@<T, R, TQual<T>, RQual<R>>)
+  struct basic_common_reference<R, T, RQual, TQual> {
+    using type = common_reference_t<typename R::type&, TQual<T>>;
+  };
+
+  template<class T, class R, template<class> class TQual, template<class> class RQual>
+    requires (@\exposconcept{ref-wrap-common-reference-exists-with}@<R, T, RQual<R>, TQual<T>> &&
+              !@\exposconcept{ref-wrap-common-reference-exists-with}@<T, R, TQual<T>, RQual<R>>)
+  struct basic_common_reference<T, R, TQual, RQual> {
+    using type = common_reference_t<typename R::type&, TQual<T>>;
+  };
+}
+\end{codeblock}
+
 \rSec2[arithmetic.operations]{Arithmetic operations}
 
 \rSec3[arithmetic.operations.general]{General}