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
+2 -1
View File
@@ -207,6 +207,7 @@ namespace boost
# 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 @@ namespace boost
// 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
{