|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r63426 - trunk/libs/system/doc
From: bdawes_at_[hidden]
Date: 2010-06-29 08:33:28
Author: bemandawes
Date: 2010-06-29 08:33:26 EDT (Tue, 29 Jun 2010)
New Revision: 63426
URL: http://svn.boost.org/trac/boost/changeset/63426
Log:
Fix #4254 and other documentation mistakes and bring into closer conformance with the C++ standard library working paper.
Text files modified:
trunk/libs/system/doc/reference.html | 63 ++++++++++++++++++++-------------------
1 files changed, 32 insertions(+), 31 deletions(-)
Modified: trunk/libs/system/doc/reference.html
==============================================================================
--- trunk/libs/system/doc/reference.html (original)
+++ trunk/libs/system/doc/reference.html 2010-06-29 08:33:26 EDT (Tue, 29 Jun 2010)
@@ -370,8 +370,8 @@
<blockquote>
<p><i>Returns:</i> <code>error_condition( ev, *this )</code>.</p>
<blockquote>
- <p> [<i>--Note:</i> Derived classes will typically convert <code>ev</code>
- to some portable <code>error_category</code>, such as <code>generic_category</code>,
+ <p dir="ltr"> [<i>--Note:</i> Derived classes will typically convert <code>ev</code>
+ to some portable <code>error_category</code>, such as <code>generic_category()</code>,
and return it as an <code>error_condition</code> for that category. <i>--end
note</i>]</p>
</blockquote>
@@ -422,10 +422,6 @@
identifying portable error conditions.</p>
<p><i>Throws:</i> Nothing.</p>
</blockquote>
-<h3><a name="Class-error_category-predefined-objects">Class <code>error_category</code>
-predefined objects</a></h3>
-<p>Predefined objects <code>system_category</code>
-and <code>generic_category</code> identify system specific error codes and portable error conditions, respectively.</p>
<h2><a name="Class-error_code">Class <code>
error_code</code></a></h2>
<p>The class <code>error_code</code> describes an object used to hold error code
@@ -447,14 +443,12 @@
error_code();
error_code( val, const error_category & cat );
template <class <code>ErrorCodeEnum</code>>
- error_code(<code> ErrorCodeEnum</code> e,
- typename enable_if<is_error_code_enum<<code>ErrorCodeEnum</code>> >::type* = 0);
+ error_code(<code> ErrorCodeEnum</code> e );
// modifiers:
void assign( int val, const error_category & cat );
template<typename <code>ErrorCodeEnum</code>>
- typename enable_if<is_error_code_enum<<code>ErrorCodeEnum</code>>, error_code>::type &
- operator=( <code>ErrorCodeEnum</code> val );;
+ error_code & operator=( <code>ErrorCodeEnum</code> val );;
void clear();
// observers:
@@ -476,7 +470,7 @@
<pre>error_code();</pre>
<blockquote>
<p><i>Effects: </i>Constructs an object of type <code>error_code</code>.</p>
- <p><i>Postconditions:</i> <code>val_ == 0 && cat_ == &system_category</code>.</p>
+ <p><i>Postconditions:</i> <code>val_ == 0 && cat_ == &system_category()</code>.</p>
<p><i>Throws:</i> Nothing.</p>
</blockquote>
<pre>error_code( int val, const error_category & cat );</pre>
@@ -486,12 +480,14 @@
<p><i>Throws:</i> Nothing.</p>
</blockquote>
<pre>template <class <code>ErrorCodeEnum</code>>
- error_code(<code> errorCodeEnum</code> val,
- typename enable_if<is_error_code_enum<<code>ErrorCodeEnum</code>> >::type* = 0);</pre>
+ error_code(<code> ErrorCodeEnum</code> val );</pre>
<blockquote>
<p><i>Effects: </i>Constructs an object of type <code>error_code</code>.</p>
<p><i>Postconditions:</i> <code>*this == make_error_code( val )</code>.</p>
<p><i>Throws:</i> Nothing.</p>
+ <p><i>Remarks:</i> This constructor shall not participate in overload
+ resolution unless <code>is_error_code_enum<ErrorCodeEnum>::value</code> is
+ <code>true</code>.</p>
</blockquote>
<h3><a name="Class-error_code-modifiers">Class <code>
error_code</code> modifiers</a></h3>
@@ -501,15 +497,17 @@
<p><i>Throws:</i> Nothing.</p>
</blockquote>
<pre>template<typename <code>ErrorCodeEnum</code>>
- typename enable_if<is_error_code_enum<<code>ErrorCodeEnum</code>>, error_code>::type &
- operator=( <code>ErrorCodeEnum</code> val );</pre>
+ error_code & operator=( <code>ErrorCodeEnum</code> val );</pre>
<blockquote>
<p><i>Postconditions:</i> <code>*this == make_error_code( val )</code>.</p>
<p><i>Throws:</i> Nothing.</p>
+ <p><i>Remarks:</i> This operator shall not participate in overload resolution
+ unless <code>is_error_code_enum<ErrorCodeEnum>::value</code> is <code>true</code>.</p>
</blockquote>
<p><code>void clear();</code></p>
<blockquote>
- <p><i>postcondition:</i> <code>value() == 0 && category() == generic_category</code></p>
+ <p><i>postcondition:</i> <code>value() == 0 && category() ==
+ system_category()</code></p>
</blockquote>
<h3><a name="Class-error_code-observers">Class <code>
error_code</code> observers</a></h3>
@@ -565,14 +563,12 @@
error_condition();
error_condition( int val, const error_category & cat );
template <class ErrorConditionEnum>
- error_condition( errorConditionEnum val,
- typename enable_if<is_error_condition_enum<ErrorConditionEnum> >::type* = 0 );
+ error_condition( errorConditionEnum val );
// modifiers:
void assign( int val, const error_category & cat );
template<typename ErrorConditionEnum>
- typename enable_if<is_error_condition_enum<ErrorConditionEnum>, error_code>::type &
- operator=( ErrorConditionEnum val );
+ error_condition & operator=( ErrorConditionEnum val );
void clear();
// observers:
@@ -593,7 +589,7 @@
<pre>error_condition(); </pre>
<blockquote>
<p><i>Effects:</i> Constructs an object of type <code>error_condition</code>.</p>
- <p><i>Postconditions:</i> <code>val_ == 0 and cat_ == &generic_category</code>.</p>
+ <p><i>Postconditions:</i> <code>val_ == 0 and cat_ == &generic_category()</code>.</p>
<p><i>Throws:</i> Nothing.</p>
</blockquote>
<pre>error_condition( int val, const error_category & cat );</pre>
@@ -603,12 +599,14 @@
<p><i>Throws:</i> Nothing.</p>
</blockquote>
<pre>template <class ErrorConditionEnum>
- error_condition( errorConditionEnum val,
- typename enable_if<is_error_condition_enum<ErrorConditionEnum> >::type* = 0 );</pre>
+ error_condition( ErrorConditionEnum e );</pre>
<blockquote>
<p><i>Effects:</i> Constructs an object of type <code>error_condition</code>.</p>
- <p><i>Postconditions:</i> <code>*this == make_error_condition( val )</code>.</p>
+ <p><i>Postconditions:</i> <code>*this == make_error_condition(e)</code>.</p>
<p><i>Throws:</i> Nothing.</p>
+ <p><i>Remarks:</i> This constructor shall not participate in overload
+ resolution unless <code>is_error_condition_enum<ErrorConditionEnum>::value</code>
+ is <code>true</code>.</p>
</blockquote>
<h3><a name="Class-error_condition-modifiers">Class <code>error_condition</code>
modifiers</a></h3>
@@ -618,15 +616,18 @@
<p><i>Throws:</i> Nothing.</p>
</blockquote>
<pre>template<typename ErrorConditionEnum>
- typename enable_if<is_error_condition_enum<ErrorConditionEnum>, error_code>::type &
- operator=( ErrorConditionEnum val );</pre>
+ error_condition & operator=( ErrorConditionEnum e );</pre>
<blockquote>
- <p><i>Postconditions:</i> <code>*this == make_error_condition( val )</code>.</p>
+ <p><i>Postconditions:</i> <code>*this == make_error_condition( e )</code>.</p>
+ <p><i>Returns:</i> <code>*this</code>.</p>
<p><i>Throws:</i> Nothing.</p>
+ <p><i>Remarks:</i> This operator shall not participate in overload resolution
+ unless <code>is_error_condition_enum<ErrorConditionEnum>::value</code> is
+ <code>true</code>.</p>
</blockquote>
<p><code>void clear();</code></p>
<blockquote>
- <p><i>postcondition:</i> <code>value() == 0 && category() == generic_category</code></p>
+ <p><i>postcondition:</i> <code>value() == 0 && category() == generic_category()</code></p>
</blockquote>
<h3><a name="Class-error_condition-observers">Class <code>error_condition</code>
observers</a></h3>
@@ -738,11 +739,11 @@
</blockquote>
<pre>error_code make_error_code( errc::errc_t e );</pre>
<blockquote>
- <p><i>Returns:</i> <code>error_code( e, generic_category)</code>.</p>
+ <p><i>Returns:</i> <code>error_code( e, generic_category())</code>.</p>
</blockquote>
<pre>error_condition make_error_condition( errc::errc_t e );</pre>
<blockquote>
- <p><i>Returns:</i> <code>error_condition( static_cast<int>( e ), generic_category)</code>.</p>
+ <p><i>Returns:</i> <code>error_condition( static_cast<int>( e ), generic_category())</code>.</p>
</blockquote>
<pre>template <class charT, class traits>
@@ -839,7 +840,7 @@
<hr>
<p>Revised
-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%B %d, %Y" startspan -->May 31, 2010<!--webbot bot="Timestamp" endspan i-checksum="11033" --> </font>
+<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%B %d, %Y" startspan -->June 29, 2010<!--webbot bot="Timestamp" endspan i-checksum="14432" --> </font>
</p>
<p>© Copyright Beman Dawes, 2006, 2007, 2008</p>
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