Apply LWG issue 805, using a namespace to emulate scoped enums.

[SVN r46645]
This commit is contained in:
Beman Dawes
2008-06-24 14:59:10 +00:00
parent 69d2a2234c
commit 2953464e99
3 changed files with 52 additions and 50 deletions
+21 -21
View File
@@ -132,10 +132,10 @@ provided, so users may ignore these macros if they prefer.</p>
template< class T="" >
struct is_error_condition_enum { static const bool value = false; };
// portable error_conditions
namespace posix_error
// generic error_conditions
namespace errc
{
enum posix_errno
enum errc_t
{
success = 0,
address_family_not_supported, //EAFNOSUPPORT
@@ -218,9 +218,9 @@ provided, so users may ignore these macros if they prefer.</p>
wrong_protocol_type //EPROTOTYPE
};
} // namespace posix_error
} // namespace errc
template<> struct is_error_condition_enum<posix::posix_errno>&lt;posix_error::posix_errno&gt;
template<> struct is_error_condition_enum<posix::posix_errno>&lt;errc::errc_t&gt;
{ static const bool value = true; };
bool operator==( const error_code &amp; lhs, const error_code &amp; rhs );
@@ -236,8 +236,8 @@ provided, so users may ignore these macros if they prefer.</p>
bool operator&lt;( const error_code &amp; lhs, const error_code &amp; rhs );
bool operator&lt;( const error_condition &amp; lhs, const error_condition &amp; rhs );
error_code make_error_code( posix_error::posix_errno e );
error_condition make_error_condition( posix_error::posix_errno e );
error_code make_error_code( errc::errc_t e );
error_condition make_error_condition( errc::errc_t e );
template &lt;class charT, class traits&gt;
std::basic_ostream&lt;charT,traits&gt;&amp;
@@ -247,7 +247,7 @@ provided, so users may ignore these macros if they prefer.</p>
}
}</pre>
</blockquote>
<p>The value of each<code> posix_errno</code> constant shall be the same as the
<p>The value of each<code> errc_t</code> constant shall be the same as the
value of the <code>&lt;cerrno&gt;</code> macro shown in the above synopsis.</p>
<p>Users may specialize <code>is_error_code_enum</code> and <code>
is_error_condition_enum</code> templates to indicate that a type is eligible for
@@ -290,10 +290,10 @@ types should create a single object of each such type. <i>
};
const error_category &amp; get_system_category();
const error_category &amp; get_posix_category();
const error_category &amp; get_generic_category();
static const error_category &amp; system_category = get_system_category();
static const error_category &amp; posix_category = get_posix_category();
static const error_category &amp; generic_category = get_generic_category();
}
}</pre>
</blockquote>
@@ -316,7 +316,7 @@ this subclause.</p>
<p><i>Returns:</i>&nbsp; <code>error_condition( ev, *this )</code>.</p>
<blockquote>
<p>&nbsp;[<i>--Note:</i> Derived classes will typically convert <code>ev</code>
to some portable <code>error_category</code>, such as <code>posix_category</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>
@@ -361,7 +361,7 @@ non-member functions</a></h3>
identifying errors originating from the operating system.</p>
<p><i>Throws:</i> Nothing.</p>
</blockquote>
<pre>const error_category &amp; get_posix_category();</pre>
<pre>const error_category &amp; get_generic_category();</pre>
<blockquote>
<p><i>Returns:</i> A reference to a <code>error_category</code> object
identifying portable error conditions.</p>
@@ -370,7 +370,7 @@ non-member functions</a></h3>
<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>posix_category</code> identify operating system error codes and portable error conditions, respectively.</p>
and <code>generic_category</code> identify operating system 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
@@ -454,7 +454,7 @@ error_code</code> modifiers</a></h3>
</blockquote>
<p><code>void clear();</code></p>
<blockquote>
<p><i>postcondition:</i> <code>value() == 0 &amp;&amp; category() == posix_category</code></p>
<p><i>postcondition:</i> <code>value() == 0 &amp;&amp; category() == generic_category</code></p>
</blockquote>
<h3><a name="Class-error_code-observers">Class <code>
error_code</code> observers</a></h3>
@@ -538,7 +538,7 @@ constructors</a></h3>
<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_ == posix_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( value_type val, const error_category &amp; cat );</pre>
@@ -571,7 +571,7 @@ modifiers</a></h3>
</blockquote>
<p><code>void clear();</code></p>
<blockquote>
<p><i>postcondition:</i> <code>value() == 0 &amp;&amp; category() == posix_category</code></p>
<p><i>postcondition:</i> <code>value() == 0 &amp;&amp; category() == generic_category</code></p>
</blockquote>
<h3><a name="Class-error_condition-observers">Class <code>error_condition</code>
observers</a></h3>
@@ -651,13 +651,13 @@ bool operator!=( const error_condition &amp; condition, const error_code &amp; c
&nbsp; || (lhs.category() == rhs.category() &amp;&amp; lhs.value() &lt; rhs.value())</code>.</p>
<p><i>Throws: </i>Nothing.</p>
</blockquote>
<pre>error_code make_error_code( posix_error::posix_errno e );</pre>
<pre>error_code make_error_code( errc::errc_t e );</pre>
<blockquote>
<p><i>Returns:</i> <code>error_code( e, posix_category)</code>.</p>
<p><i>Returns:</i> <code>error_code( e, generic_category)</code>.</p>
</blockquote>
<pre>error_condition make_error_condition( posix_error::posix_errno e );</pre>
<pre>error_condition make_error_condition( errc::errc_t e );</pre>
<blockquote>
<p><i>Returns:</i> <code>error_condition( e, posix_category)</code>.</p>
<p><i>Returns:</i> <code>error_condition( e, generic_category)</code>.</p>
</blockquote>
<pre>template &lt;class charT, class traits&gt;
@@ -743,7 +743,7 @@ Distributed under the Boost Software License, Version 1.0. See
<a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a></p>
<p>Revised
<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%B %d, %Y" startspan -->November 12, 2007<!--webbot bot="Timestamp" endspan i-checksum="39581" --> </font>
<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%B %d, %Y" startspan -->June 24, 2008<!--webbot bot="Timestamp" endspan i-checksum="14232" --> </font>
</p>
</body>