[Boost-commit] svn:boost r48746 - sandbox/committee/concepts/stdlib

Subject: [Boost-commit] svn:boost r48746 - sandbox/committee/concepts/stdlib
From: dgregor_at_[hidden]
Date: 2008-09-11 16:31:41

Author: dgregor
Date: 2008-09-11 16:31:40 EDT (Thu, 11 Sep 2008)
New Revision: 48746
URL: http://svn.boost.org/trac/boost/changeset/48746

Log:
More fixes
Text files modified: 
   sandbox/committee/concepts/stdlib/clib-concepts.tex   |     7 +++----                                 
   sandbox/committee/concepts/stdlib/clib-containers.tex |    13 +++++++++++--                           
   2 files changed, 14 insertions(+), 6 deletions(-)

Modified: sandbox/committee/concepts/stdlib/clib-concepts.tex
==============================================================================
--- sandbox/committee/concepts/stdlib/clib-concepts.tex	(original)
+++ sandbox/committee/concepts/stdlib/clib-concepts.tex	2008-09-11 16:31:40 EDT (Thu, 11 Sep 2008)
@@ -411,7 +411,7 @@
 \pnum 
 \addedConcepts{\mbox{\requires}
 for every type \mbox{\tcode{T}} that is an object type,
-  cv-unqualified function type, or \mbox{\techterm{cv}} \mbox{\tcode{void}}, a
+  a function type that does not have cv-qualifiers, or \mbox{\techterm{cv}} \mbox{\tcode{void}}, a
   concept map \mbox{\tcode{PointeeType}} shall be implicitly defined
   in namespace \mbox{\tcode{std}}.}
 \end{itemdescr}
@@ -449,7 +449,7 @@
 \pnum 
 \mbox{\requires}
 for every type \mbox{\tcode{T}} that is an object type, a
-  cv-unqualified function type, or a reference type, a
+  function type that does not have cv-qualifiers, or a reference type, a
   concept map \mbox{\tcode{ReferentType}} shall be implicitly defined
   in namespace \mbox{\tcode{std}}.
 \end{itemdescr}
@@ -1505,9 +1505,8 @@
 \end{itemdescr}
 
 \begin{itemdecl}
-auto concept Constructible<typename T, typename... Args> {
+auto concept Constructible<typename T, typename... Args>
   : HasConstructor<T, Args...>, NothrowDestructible<T> { }
-}
 \end{itemdecl}
 
 \begin{itemdescr}

Modified: sandbox/committee/concepts/stdlib/clib-containers.tex
==============================================================================
--- sandbox/committee/concepts/stdlib/clib-containers.tex	(original)
+++ sandbox/committee/concepts/stdlib/clib-containers.tex	2008-09-11 16:31:40 EDT (Thu, 11 Sep 2008)
@@ -959,13 +959,17 @@
   ForwardIterator iterator;
   ForwardIterator const_iterator;
 
-  requires Convertible<iterator, const_iterator>
+  requires Convertible<reference, const_reference>
+        && Convertible<reference, const value_type&>
+        && Convertible<const_reference, const _value_type&>;
+        && Convertible<iterator, const_iterator>
         && SameType<ForwardIterator<iterator>::value_type, value_type> 
         && SameType<ForwardIterator<const_iterator>::value_type, value_type>
         && Convertible<ForwardIterator<iterator>::reference, reference>
         && Convertible<ForwardIterator<const_iterator>::reference, const_reference>
         && SameType<ForwardIterator<iterator>::difference_type,
                     ForwardIterator<const_iterator>::difference_type>
+        && IntegralType<size_type>
         && Convertible<ForwardIterator<iterator>::difference_type, size_type>;
 
   bool           empty(const C& c) { return begin(c) == end(c); }
@@ -1141,13 +1145,18 @@
 
   ForwardIterator iterator;
   ForwardIterator const_iterator;
-  requires Convertible<iterator, const_iterator>
+
+  requires Convertible<reference, const_reference>
+        && Convertible<reference, const value_type&>
+        && Convertible<const_reference, const _value_type&>;
+        && Convertible<iterator, const_iterator>
         && SameType<ForwardIterator<iterator>::value_type, value_type> 
         && SameType<ForwardIterator<const_iterator>::value_type, value_type>
         && Convertible<ForwardIterator<iterator>::reference, reference>
         && Convertible<ForwardIterator<const_iterator>::reference, const_reference>
         && SameType<ForwardIterator<iterator>::difference_type,
                     ForwardIterator<const_iterator>::difference_type>
+        && IntegralType<size_type>
         && Convertible<ForwardIterator<iterator>::difference_type, size_type>;
 
   bool           C::empty() const { return  this->begin() == this->end(); }