[Boost-commit] svn:boost r44511 - sandbox/committee/concepts/wording

From: dgregor_at_[hidden]
Date: 2008-04-17 14:40:04

Author: dgregor
Date: 2008-04-17 14:40:04 EDT (Thu, 17 Apr 2008)
New Revision: 44511
URL: http://svn.boost.org/trac/boost/changeset/44511

Log:
Slight cleanup to notion of consistency in candidate sets
Text files modified: 
   sandbox/committee/concepts/wording/wording.tex |    10 ++++++----                              
   1 files changed, 6 insertions(+), 4 deletions(-)

Modified: sandbox/committee/concepts/wording/wording.tex
==============================================================================
--- sandbox/committee/concepts/wording/wording.tex	(original)
+++ sandbox/committee/concepts/wording/wording.tex	2008-04-17 14:40:04 EDT (Thu, 17 Apr 2008)
@@ -5421,10 +5421,11 @@
 \item \addedCC{it has the same name as the seed,}
 \item \addedCC{its enclosing namespace is the same as the enclosing
     namespace of the seed,}
-\item \addedCC{it has the same return type as the seed, after the
+\item \addedCC{the seed has a return type of \mbox{\techterm{cv}
+      \tcode{void}} or the function has the same return type as the seed, after the
     reference (if any) 
     and then top-level \mbox{\techterm{cv-qualifiers}} (if any) have been
-    removed, and}
+    removed from the return types of the seed and the function, and}
 \additemCC{it has the same \mbox{\techterm{parameter-type-list}} as
   the seed, after making the following adjustments to both
   \mbox{\techterm{parameter-type-list}}s:} 
@@ -5434,11 +5435,12 @@
     parameter in the \mbox{\techterm{parameter-type-list}},}
   \additemCC{for each parameter type, remove the top-level reference
     (if any) and then top-level \mbox{\techterm{cv-qualifiers}} (if
-    any), and} 
+    any),} 
   \additemCC{if the function has \mbox{$M$} parameters, the seed has
     \mbox{$N$} parameters, and \mbox{$M > N$}, remove each of the last
     \mbox{$M-N$} parameters that has a default argument from the
-    \mbox{\techterm{parameter-type-list}}.}
+    \mbox{\techterm{parameter-type-list}}, and}
+  \additemCC{remove the ellipsis, if any.}
 \end{itemize}
 \end{itemize}
 \addedCC{\enternote No function or function template is consistent