System: merge from trunk

[SVN r50700]
This commit is contained in:
Beman Dawes
2009-01-21 14:08:54 +00:00
parent 726478b372
commit 40612c12db
3 changed files with 5 additions and 3 deletions

View File

@ -207,6 +207,7 @@ namespace boost
# ifndef BOOST_SYSTEM_NO_DEPRECATED # ifndef BOOST_SYSTEM_NO_DEPRECATED
// deprecated synonyms // 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 & posix_category = get_generic_category();
static const error_category & errno_ecat = get_generic_category(); static const error_category & errno_ecat = get_generic_category();
static const error_category & native_ecat = get_system_category(); static const error_category & native_ecat = get_system_category();
@ -214,7 +215,7 @@ namespace boost
// class error_condition -----------------------------------------------// // 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 class error_condition
{ {

View File

@ -80,7 +80,8 @@ namespace
# if defined(BOOST_WINDOWS_API) || defined(__hpux) || defined(__sun)\ # if defined(BOOST_WINDOWS_API) || defined(__hpux) || defined(__sun)\
|| (defined(__linux) && (!defined(__USE_XOPEN2K) || defined(BOOST_SYSTEM_USE_STRERROR)))\ || (defined(__linux) && (!defined(__USE_XOPEN2K) || defined(BOOST_SYSTEM_USE_STRERROR)))\
|| (defined(__osf__) && !defined(_REENTRANT))\ || (defined(__osf__) && !defined(_REENTRANT))\
|| (defined(__vms)) || (defined(__vms))\
|| (defined(__QNXNTO__))
const char * c_str = std::strerror( ev ); const char * c_str = std::strerror( ev );
return c_str return c_str
? std::string( c_str ) ? std::string( c_str )

View File

@ -40,4 +40,4 @@ project
[ run header_only_test.cpp [ run header_only_test.cpp
: : : <link>static : : : <link>static
] ]
; ;