Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r50700 - in branches/release: boost/system libs/system/src libs/system/test
From: bdawes_at_[hidden]
Date: 2009-01-21 09:08:54


Author: bemandawes
Date: 2009-01-21 09:08:54 EST (Wed, 21 Jan 2009)
New Revision: 50700
URL: http://svn.boost.org/trac/boost/changeset/50700

Log:
System: merge from trunk
Text files modified:
   branches/release/boost/system/error_code.hpp | 3 ++-
   branches/release/libs/system/src/error_code.cpp | 3 ++-
   branches/release/libs/system/test/Jamfile.v2 | 2 +-
   3 files changed, 5 insertions(+), 3 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-01-21 09:08:54 EST (Wed, 21 Jan 2009)
@@ -207,6 +207,7 @@
     
 # ifndef BOOST_SYSTEM_NO_DEPRECATED
     // deprecated synonyms
+ inline const error_category & get_posix_category() { return get_generic_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();
@@ -214,7 +215,7 @@
 
     // class error_condition -----------------------------------------------//
 
- // error_conditions are portable, error_codes are system or lib specific
+ // error_conditions are portable, error_codes are system or library specific
 
     class error_condition
     {

Modified: branches/release/libs/system/src/error_code.cpp
==============================================================================
--- branches/release/libs/system/src/error_code.cpp (original)
+++ branches/release/libs/system/src/error_code.cpp 2009-01-21 09:08:54 EST (Wed, 21 Jan 2009)
@@ -80,7 +80,8 @@
   # if defined(BOOST_WINDOWS_API) || defined(__hpux) || defined(__sun)\
      || (defined(__linux) && (!defined(__USE_XOPEN2K) || defined(BOOST_SYSTEM_USE_STRERROR)))\
      || (defined(__osf__) && !defined(_REENTRANT))\
- || (defined(__vms))
+ || (defined(__vms))\
+ || (defined(__QNXNTO__))
       const char * c_str = std::strerror( ev );
       return c_str
         ? std::string( c_str )

Modified: branches/release/libs/system/test/Jamfile.v2
==============================================================================
--- branches/release/libs/system/test/Jamfile.v2 (original)
+++ branches/release/libs/system/test/Jamfile.v2 2009-01-21 09:08:54 EST (Wed, 21 Jan 2009)
@@ -40,4 +40,4 @@
          [ run header_only_test.cpp
            : : : <link>static
          ]
- ;
+ ;


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