From 40612c12db86eb3c9e10fc2b09d74ca3ffcd4f36 Mon Sep 17 00:00:00 2001
From: Beman Dawes <bdawes@acm.org>
Date: Wed, 21 Jan 2009 14:08:54 +0000
Subject: [PATCH] System: merge from trunk

[SVN r50700]
---
 include/boost/system/error_code.hpp | 3 ++-
 src/error_code.cpp                  | 3 ++-
 test/Jamfile.v2                     | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/boost/system/error_code.hpp b/include/boost/system/error_code.hpp
index c79c26c..8f795d7 100644
--- a/include/boost/system/error_code.hpp
+++ b/include/boost/system/error_code.hpp
@@ -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
     {
diff --git a/src/error_code.cpp b/src/error_code.cpp
index 55fcfc6..030ab70 100644
--- a/src/error_code.cpp
+++ b/src/error_code.cpp
@@ -80,7 +80,8 @@ namespace
   # 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 )
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 7b14c76..1a7111d 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -40,4 +40,4 @@ project
          [ run header_only_test.cpp
            :  :  : <link>static
          ]
-         ;
+        ;