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

From: dgregor_at_[hidden]
Date: 2008-05-28 15:49:27

Author: dgregor
Date: 2008-05-28 15:49:27 EDT (Wed, 28 May 2008)
New Revision: 45877
URL: http://svn.boost.org/trac/boost/changeset/45877

Log:
Very minor wording fixes to clause 12, and added a cross-reference to temp.req.sat
Text files modified: 
   sandbox/committee/concepts/wording/macros.tex  |     9 ++++++++-                               
   sandbox/committee/concepts/wording/wording.tex |    21 +++++++++++++--------                   
   2 files changed, 21 insertions(+), 9 deletions(-)

Modified: sandbox/committee/concepts/wording/macros.tex
==============================================================================
--- sandbox/committee/concepts/wording/macros.tex	(original)
+++ sandbox/committee/concepts/wording/macros.tex	2008-05-28 15:49:27 EDT (Wed, 28 May 2008)
@@ -96,7 +96,7 @@
 \newcommand{\remitemConcepts}[1]{\remitem{#1}}
 \newcommand{\additemConcepts}[1]{\additem{#1}}
 
-%% Concepts revision 4 changes
+%% Concepts changes since the last revision
 \definecolor{ccadd}{rgb}{0,.6,0}
 \newcommand{\addedCC}[1]{\textcolor{ccadd}{\ul{#1}}}
 \newcommand{\removedCC}[1]{\textcolor{remclr}{\st{#1}}}
@@ -106,6 +106,13 @@
 \newcommand{\changedCCC}[2]{\textcolor{addclr}{\st{#1}}\addedCC{#2}}
 \newcommand{\removedCCC}[1]{\textcolor{addclr}{\st{#1}}}
 
+%% Concepts changes for the next revision
+\definecolor{zadd}{rgb}{0.8,0,0.8}
+\newcommand{\addedZ}[1]{\textcolor{zadd}{\ul{#1}}}
+\newcommand{\removedZ}[1]{\textcolor{remclr}{\st{#1}}}
+\newcommand{\changedCZ}[2]{\textcolor{addclr}{\st{#1}}\addedZ{#2}}
+
+
 %%--------------------------------------------------
 %% Sectioning macros.  
 % Each section has a depth, an automatically generated section 

Modified: sandbox/committee/concepts/wording/wording.tex
==============================================================================
--- sandbox/committee/concepts/wording/wording.tex	(original)
+++ sandbox/committee/concepts/wording/wording.tex	2008-05-28 15:49:27 EDT (Wed, 28 May 2008)
@@ -49,7 +49,7 @@
 \huge
 \begin{center}
 Proposed Wording for Concepts\\
-(Revision 5)
+(Revision 6)
 \end{center}
 
 \normalsize
@@ -62,8 +62,8 @@
 Jeremy Siek, University of Colorado at Boulder
 \end{tabular}\vspace{-6pt}
 
-\par\noindent Document number: N2617=08-0127 \vspace{-6pt}
-\par\noindent Revises document number: N2501=08-0011 \vspace{-6pt}
+\par\noindent Document number: DRAFT \vspace{-6pt}
+\par\noindent Revises document number: N2617=08-0127 \vspace{-6pt}
 \par\noindent Date: \today\vspace{-6pt}
 \par\noindent Project: Programming Language C++, Core Working Group\vspace{-6pt}
 \par\noindent Reply-to: Douglas Gregor $<$\href{mailto:doug.gregor_at_[hidden]}{doug.gregor_at_[hidden]}$>$
@@ -1552,7 +1552,9 @@
 when it is used to destroy an object of its class type (\ref{basic.stc}).
 A program is ill-formed
 \changedCC{if the class for which a destructor is implicitly
-defined has:}{if the implicitly-defined constructor is explicitly
+defined has:}{if the implicitly-defined}
+\changedCZ{constructor}{destructor}
+\addedCC{is explicitly
 defaulted, but the corresponding implicit declaration would have been deleted.}
 
 \begin{itemize}
@@ -1843,9 +1845,10 @@
 a value of a class type derived from its class type.
 \index{restriction!copy assignment~operator}%
 A program is ill-formed \changedConcepts{if the class for which a copy assignment operator
-is implicitly defined has:}{if the implicitly-defined copy constructor
-is explicitly defaulted, but the corresponding implicit declaration
-would have been deleted.}
+is implicitly defined has:}{if the implicitly-defined copy}
+\changedCZ{constructor}{assignment operator}
+\addedConcepts{is explicitly defaulted, but the corresponding implicit 
+declaration would have been deleted.}
 
 \begin{itemize}
 \item
@@ -5109,7 +5112,9 @@
   formed from the concept of a requirement and its template argument list
   after substitution of template arguments for their corresponding
   template parameters.  There
-  is an associated full concept name of \mbox{\tcode{I}}; call it
+  is an associated full concept name} 
+\addedZ{(\mbox{\ref{concept.def}})}
+\addedCC{of \mbox{\tcode{I}}; call it
   \mbox{\tcode{N}}. Concept map lookup searches an ordered sequence
   \mbox{\tcode{Q}} (defined below) where each element is a set of
   concept maps called