Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r54248 - sandbox/committee/LWG/proposals
From: dave_at_[hidden]
Date: 2009-06-22 21:06:12


Author: dave
Date: 2009-06-22 21:06:11 EDT (Mon, 22 Jun 2009)
New Revision: 54248
URL: http://svn.boost.org/trac/boost/changeset/54248

Log:
fixed a ReST-ing bug
Text files modified:
   sandbox/committee/LWG/proposals/exported-concept-maps.html | 67 +++++++++++++++++++--------------------
   sandbox/committee/LWG/proposals/exported-concept-maps.rst | 2
   2 files changed, 34 insertions(+), 35 deletions(-)

Modified: sandbox/committee/LWG/proposals/exported-concept-maps.html
==============================================================================
--- sandbox/committee/LWG/proposals/exported-concept-maps.html (original)
+++ sandbox/committee/LWG/proposals/exported-concept-maps.html 2009-06-22 21:06:11 EDT (Mon, 22 Jun 2009)
@@ -605,42 +605,41 @@
 corresponds to this artificial first parameter is the type of the
 implied object argument (13.3.1). [Example:</span></p>
 <pre class="literal-block">
- concept C&lt;typename T&gt; { }
+concept C&lt;typename T&gt; { }
 
- concept M1&lt;typename T&gt; {
- void T::f();
- }
-
- concept M2&lt;typename T, typename U&gt; {
- void T::f(U);
- }
-
- template&lt;C T&gt; struct X { };
-
- template&lt;C T&gt;
- export concept_map M1&lt;X&lt;T&gt;&gt; {
- void X&lt;T&gt;::f() { }
- }
-
- template&lt;C T, typename U&gt;
- export concept_map M2&lt;X&lt;T&gt;, U&gt; {
- void X&lt;T&gt;::f(U) { }
- }
-
- void f(X&lt;int&gt; x, float y) {
- x.f(); // okay: template argument deduction deduces that T=int by
- // matching the artificial first parameter of type X&lt;T&gt;
- // to the implied object argument of type X&lt;int&gt;.
- x.f(y); // okay: template argument deduction for M1's X&lt;T&gt;::f
- // succeeds with T=int, but the resulting visible
- // function is not a viable overload candidate.
- // template argument deduction with M2's X&lt;T&gt;::f
- // succeeds with T=int and U=float, making M2&lt;X&lt;int&gt;, float&gt;'s
- // X&lt;int&gt;::f(float) visible (and viable).
- }
-
-:ins:`- end example]`
+concept M1&lt;typename T&gt; {
+ void T::f();
+}
+
+concept M2&lt;typename T, typename U&gt; {
+ void T::f(U);
+}
+
+template&lt;C T&gt; struct X { };
+
+template&lt;C T&gt;
+export concept_map M1&lt;X&lt;T&gt;&gt; {
+ void X&lt;T&gt;::f() { }
+}
+
+template&lt;C T, typename U&gt;
+export concept_map M2&lt;X&lt;T&gt;, U&gt; {
+ void X&lt;T&gt;::f(U) { }
+}
+
+void f(X&lt;int&gt; x, float y) {
+ x.f(); // okay: template argument deduction deduces that T=int by
+ // matching the artificial first parameter of type X&lt;T&gt;
+ // to the implied object argument of type X&lt;int&gt;.
+ x.f(y); // okay: template argument deduction for M1's X&lt;T&gt;::f
+ // succeeds with T=int, but the resulting visible
+ // function is not a viable overload candidate.
+ // template argument deduction with M2's X&lt;T&gt;::f
+ // succeeds with T=int and U=float, making M2&lt;X&lt;int&gt;, float&gt;'s
+ // X&lt;int&gt;::f(float) visible (and viable).
+}
 </pre>
+<p><span class="ins">- end example]</span></p>
 </blockquote>
 </div>
 <div class="section" id="bibliography">

Modified: sandbox/committee/LWG/proposals/exported-concept-maps.rst
==============================================================================
--- sandbox/committee/LWG/proposals/exported-concept-maps.rst (original)
+++ sandbox/committee/LWG/proposals/exported-concept-maps.rst 2009-06-22 21:06:11 EDT (Mon, 22 Jun 2009)
@@ -352,7 +352,7 @@
                 // X<int>::f(float) visible (and viable).
       }
 
- :ins:`- end example]`
+ :ins:`- end example]`
 
 Bibliography
 ============


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk