From 2953464e994b467592b436cdc99e7fb3e1b16953 Mon Sep 17 00:00:00 2001 From: Beman Dawes Date: Tue, 24 Jun 2008 14:59:10 +0000 Subject: [PATCH] Apply LWG issue 805, using a namespace to emulate scoped enums. [SVN r46645] --- doc/reference.html | 42 ++++++++++++++--------------- include/boost/system/error_code.hpp | 38 +++++++++++++------------- src/error_code.cpp | 22 +++++++-------- 3 files changed, 52 insertions(+), 50 deletions(-) diff --git a/doc/reference.html b/doc/reference.html index 21b8489..2381252 100644 --- a/doc/reference.html +++ b/doc/reference.html @@ -132,10 +132,10 @@ provided, so users may ignore these macros if they prefer.

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.

wrong_protocol_type //EPROTOTYPE }; - } // namespace posix_error + } // namespace errc - template<> struct is_error_condition_enum<posix_error::posix_errno> + template<> struct is_error_condition_enum<errc::errc_t> { static const bool value = true; }; bool operator==( const error_code & lhs, const error_code & rhs ); @@ -236,8 +236,8 @@ provided, so users may ignore these macros if they prefer.

bool operator<( const error_code & lhs, const error_code & rhs ); bool operator<( const error_condition & lhs, const error_condition & 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 <class charT, class traits> std::basic_ostream<charT,traits>& @@ -247,7 +247,7 @@ provided, so users may ignore these macros if they prefer.

} } -

The value of each posix_errno constant shall be the same as the +

The value of each errc_t constant shall be the same as the value of the <cerrno> macro shown in the above synopsis.

Users may specialize is_error_code_enum and is_error_condition_enum templates to indicate that a type is eligible for @@ -290,10 +290,10 @@ types should create a single object of each such type. }; const error_category & get_system_category(); - const error_category & get_posix_category(); + const error_category & get_generic_category(); static const error_category & system_category = get_system_category(); - static const error_category & posix_category = get_posix_category(); + static const error_category & generic_category = get_generic_category(); } } @@ -316,7 +316,7 @@ this subclause.

Returns:  error_condition( ev, *this ).

 [--Note: Derived classes will typically convert ev - to some portable error_category, such as posix_category, + to some portable error_category, such as generic_category, and return it as an error_condition for that category. --end note]

@@ -361,7 +361,7 @@ non-member functions identifying errors originating from the operating system.

Throws: Nothing.

-
const error_category & get_posix_category();
+
const error_category & get_generic_category();

Returns: A reference to a error_category object identifying portable error conditions.

@@ -370,7 +370,7 @@ non-member functions

Class error_category predefined objects

Predefined objects system_category -and posix_category identify operating system error codes and portable error conditions, respectively.

+and generic_category identify operating system error codes and portable error conditions, respectively.

Class error_code

The class error_code describes an object used to hold error code @@ -454,7 +454,7 @@ error_code modifiers

void clear();

-

postcondition: value() == 0 && category() == posix_category

+

postcondition: value() == 0 && category() == generic_category

Class error_code observers

@@ -538,7 +538,7 @@ constructors 
error_condition();

Effects: Constructs an object of type error_condition.

-

Postconditions: val_ == 0 and cat_ == posix_category.

+

Postconditions: val_ == 0 and cat_ == generic_category.

Throws: Nothing.

error_condition( value_type val, const error_category & cat );
@@ -571,7 +571,7 @@ modifiers

void clear();

-

postcondition: value() == 0 && category() == posix_category

+

postcondition: value() == 0 && category() == generic_category

Class error_condition observers

@@ -651,13 +651,13 @@ bool operator!=( const error_condition & condition, const error_code & c   || (lhs.category() == rhs.category() && lhs.value() < rhs.value()).

Throws: Nothing.

-
error_code make_error_code( posix_error::posix_errno e );
+
error_code make_error_code( errc::errc_t e );
-

Returns: error_code( e, posix_category).

+

Returns: error_code( e, generic_category).

-
error_condition make_error_condition( posix_error::posix_errno e );
+
error_condition make_error_condition( errc::errc_t e );
-

Returns: error_condition( e, posix_category).

+

Returns: error_condition( e, generic_category).

template <class charT, class traits>
@@ -743,7 +743,7 @@ Distributed under the Boost Software License, Version 1.0. See
 www.boost.org/LICENSE_1_0.txt

 
 
Revised 
-November 12, 2007 
+June 24, 2008 
 

 
 
diff --git a/include/boost/system/error_code.hpp b/include/boost/system/error_code.hpp
index d06ddef..a5db008 100644
--- a/include/boost/system/error_code.hpp
+++ b/include/boost/system/error_code.hpp
@@ -47,11 +47,11 @@ namespace boost
     template< class T >
     struct is_error_condition_enum { static const bool value = false; };
 
-    //  portable error_conditions  -------------------------------------------//
+    //  generic error_conditions  --------------------------------------------//
 
-    namespace posix_error
+    namespace errc
     {
-      enum posix_errno
+      enum errc_t
       {
         success = 0,
         address_family_not_supported = EAFNOSUPPORT,
@@ -134,13 +134,14 @@ namespace boost
         wrong_protocol_type = EPROTOTYPE
       };
 
-    } // namespace posix_error
+    } // namespace errc
 
 # ifndef BOOST_SYSTEM_NO_DEPRECATED
-    namespace posix = posix_error;
+    namespace posix = errc;
+    namespace posix_error = errc;
 # endif
 
-    template<> struct is_error_condition_enum
+    template<> struct is_error_condition_enum
       { static const bool value = true; };
 
 
@@ -199,15 +200,16 @@ namespace boost
     //  predefined error categories  -----------------------------------------//
 
     BOOST_SYSTEM_DECL const error_category &  get_system_category();
-    BOOST_SYSTEM_DECL const error_category &  get_posix_category();
+    BOOST_SYSTEM_DECL const error_category &  get_generic_category();
 
     static const error_category &  system_category = get_system_category();
-    static const error_category &  posix_category = get_posix_category();
+    static const error_category &  generic_category = get_generic_category();
     
 # ifndef BOOST_SYSTEM_NO_DEPRECATED
     //  deprecated synonyms
-    static const error_category &  errno_ecat  = get_posix_category();
-    static const error_category &  native_ecat = get_system_category();
+    static const error_category &  posix_category = get_generic_category();
+    static const error_category &  errno_ecat     = get_generic_category();
+    static const error_category &  native_ecat    = get_system_category();
 # endif
 
     //  class error_condition  -----------------------------------------------//
@@ -219,7 +221,7 @@ namespace boost
     public:
 
       // constructors:
-      error_condition() : m_val(0), m_cat(&get_posix_category()) {}
+      error_condition() : m_val(0), m_cat(&get_generic_category()) {}
       error_condition( int val, const error_category & cat ) : m_val(val), m_cat(&cat) {}
 
       template 
@@ -248,7 +250,7 @@ namespace boost
       void clear()
       {
         m_val = 0;
-        m_cat = &get_posix_category();
+        m_cat = &get_generic_category();
       }
 
       // observers:
@@ -436,17 +438,17 @@ namespace boost
         + reinterpret_cast(&ec.category());
     }
 
-    //  make_* functions for posix_error::posix_errno  -----------------------------//
+    //  make_* functions for errc::errc_t  -----------------------------//
 
-    namespace posix_error
+    namespace errc
     {
       //  explicit conversion:
-      inline error_code make_error_code( posix_errno e )
-        { return error_code( e, get_posix_category() ); }
+      inline error_code make_error_code( errc_t e )
+        { return error_code( e, get_generic_category() ); }
 
       //  implicit conversion:
-      inline error_condition make_error_condition( posix_errno e )
-        { return error_condition( e, get_posix_category() ); }
+      inline error_condition make_error_condition( errc_t e )
+        { return error_condition( e, get_generic_category() ); }
     }
 
     //  error_category default implementation  -------------------------------//
diff --git a/src/error_code.cpp b/src/error_code.cpp
index f43eb9a..f2623fc 100644
--- a/src/error_code.cpp
+++ b/src/error_code.cpp
@@ -38,12 +38,12 @@ using namespace boost::system::posix_error;
 
 namespace
 {
-  //  standard error categories  -------------------------------------------//
+  //  standard error categories  ---------------------------------------------//
 
-  class posix_error_category : public error_category
+  class generic_error_category : public error_category
   {
   public:
-    posix_error_category(){}
+    generic_error_category(){}
     const char *   name() const;
     std::string    message( int ev ) const;
   };
@@ -57,14 +57,14 @@ namespace
     error_condition     default_error_condition( int ev ) const;
   };
 
-  //  posix_error_category implementation  ---------------------------------//
+  //  generic_error_category implementation  ---------------------------------//
 
-  const char * posix_error_category::name() const
+  const char * generic_error_category::name() const
   {
-    return "POSIX";
+    return "GENERIC";
   }
 
-  std::string posix_error_category::message( int ev ) const
+  std::string generic_error_category::message( int ev ) const
   {
   // strerror_r is preferred because it is always thread safe,
   // however, we fallback to strerror in certain cases because:
@@ -318,7 +318,7 @@ namespace
 
   std::string system_error_category::message( int ev ) const
   {
-    return posix_category.message( ev );
+    return generic_category.message( ev );
   }
 # else
 // TODO:
@@ -402,10 +402,10 @@ namespace boost
       return system_category_const;
     }
 
-    BOOST_SYSTEM_DECL const error_category & get_posix_category()
+    BOOST_SYSTEM_DECL const error_category & get_generic_category()
     {
-      static const posix_error_category posix_category_const;
-      return posix_category_const;
+      static const generic_error_category generic_category_const;
+      return generic_category_const;
     }
 
   } // namespace system