Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r56777 - in branches/release: boost/system libs/system
From: bdawes_at_[hidden]
Date: 2009-10-13 09:44:43


Author: bemandawes
Date: 2009-10-13 09:44:42 EDT (Tue, 13 Oct 2009)
New Revision: 56777
URL: http://svn.boost.org/trac/boost/changeset/56777

Log:
system: merge trunk
Properties modified:
   branches/release/boost/system/ (props changed)
   branches/release/libs/system/ (props changed)
Text files modified:
   branches/release/boost/system/error_code.hpp | 26 ++++++++------------------
   1 files changed, 8 insertions(+), 18 deletions(-)

Modified: branches/release/boost/system/error_code.hpp
==============================================================================
--- branches/release/boost/system/error_code.hpp (original)
+++ branches/release/boost/system/error_code.hpp 2009-10-13 09:44:42 EDT (Tue, 13 Oct 2009)
@@ -183,11 +183,14 @@
     {
     public:
       virtual ~error_category(){}
- virtual inline const char * name() const; // see implementation note below
- virtual inline std::string message( int ev ) const; // see implementation note below
- virtual inline error_condition default_error_condition( int ev ) const;
- virtual inline bool equivalent( int code, const error_condition & condition ) const;
- virtual inline bool equivalent( const error_code & code, int condition ) const;
+
+ virtual const char * name() const = 0;
+ virtual std::string message( int ev ) const = 0;
+ virtual error_condition default_error_condition( int ev ) const;
+ virtual bool equivalent( int code,
+ const error_condition & condition ) const;
+ virtual bool equivalent( const error_code & code,
+ int condition ) const;
 
       bool operator==(const error_category & rhs) const { return this == &rhs; }
       bool operator!=(const error_category & rhs) const { return this != &rhs; }
@@ -496,19 +499,6 @@
       return *this == code.category() && code.value() == condition;
     }
 
- // error_category implementation note: VC++ 8.0 objects to name() and
- // message() being pure virtual functions. Thus these implementations.
- inline const char * error_category::name() const
- {
- return "error: should never be called";
- }
-
- inline std::string error_category::message( int ) const
- {
- static std::string s("error: should never be called");
- return s;
- }
-
   } // namespace system
 } // namespace boost
 


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