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

From: dgregor_at_[hidden]
Date: 2008-08-21 17:30:45

Author: dgregor
Date: 2008-08-21 17:30:45 EDT (Thu, 21 Aug 2008)
New Revision: 48285
URL: http://svn.boost.org/trac/boost/changeset/48285

Log:
Move a paragraph into its proper place in [temp.over.link]
Text files modified: 
   sandbox/committee/concepts/wording/wording.tex |    20 ++++++++++++--------                    
   1 files changed, 12 insertions(+), 8 deletions(-)

Modified: sandbox/committee/concepts/wording/wording.tex
==============================================================================
--- sandbox/committee/concepts/wording/wording.tex	(original)
+++ sandbox/committee/concepts/wording/wording.tex	2008-08-21 17:30:45 EDT (Thu, 21 Aug 2008)
@@ -594,15 +594,18 @@
 \additemConcepts{
 If the template argument list of the concept instance references a
 template parameter or associated type of a requirement, and if the name,
-when looked up within the scope of the concept of the concept instance,
-unambiguously refers to an associated type or class template, the result
+when looked up within the scope of the concept}
+\changedCCC{of}{(not}
+\addedConcepts{the concept instance}\addedCC{)}\addedConcepts{,}
+\removedCCC{unambiguously}
+\addedConcepts{refers to an associated type or class template, the result
 of name lookup is the associated type or class template as a member of the
 requirement.
     \mbox{\enternote}\ this implies that, given two distinct type parameters
-    T and U, C<T>::type and C<U>::type are distinct types (though they may
-    refer to the same archetype).  Also, the mere lookup of 'type' within C<T>
-    and C<U> does not require the creation of a concept map archetype for
-    C<T> or C<U>.
+    \mbox{\tcode{T}} and \mbox{\tcode{U}}, \mbox{\tcode{C<T>::type}} and \mbox{\tcode{C<U>::type}} are distinct types (although they may
+    refer to the same archetype).  Also, lookup of 'type' within \mbox{\tcode{C<T>}}
+    and \mbox{\tcode{C<U>}} does not require the creation of a concept map archetype for
+    \mbox{\tcode{C<T>}} or \mbox{\tcode{C<U>}}.
     \mbox{\exitnote}\ }
 \additemConcepts{
 Otherwise, concept map lookup (\mbox{\ref{temp.req.sat}}) first determines
@@ -2773,14 +2776,15 @@
 \exitexample\ 
 
 \rSec2[temp.fct]{Function templates}
+\rSec3[temp.over.link]{Function template overloading}
 
-\setcounter{Paras}{6}
+\setcounter{Paras}{5}
 \pnum
 Two function templates are
 \techterm{equivalent}\ 
 if they are declared in the same scope, have the same name, have
 identical template parameter lists, \addedConcepts{have identical
-  template requirements}, and have return types
+  template requirements (if any)}, and have return types
   and parameter 
 lists that are equivalent using the rules described above to compare
 expressions involving