[Boost-commit] svn:boost r78528 - in branches/release: boost/system libs/system libs/system/src libs/system/test

Subject: [Boost-commit] svn:boost r78528 - in branches/release: boost/system libs/system libs/system/src libs/system/test
From: bdawes_at_[hidden]
Date: 2012-05-21 09:39:59

Author: bemandawes
Date: 2012-05-21 09:39:58 EDT (Mon, 21 May 2012)
New Revision: 78528
URL: http://svn.boost.org/trac/boost/changeset/78528

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/config.hpp        |    17 +++++++++++++++++                       
   branches/release/libs/system/src/error_code.cpp |     3 ++-                                     
   branches/release/libs/system/test/Jamfile.v2    |     1 +                                       
   3 files changed, 20 insertions(+), 1 deletions(-)

Modified: branches/release/boost/system/config.hpp
==============================================================================
--- branches/release/boost/system/config.hpp	(original)
+++ branches/release/boost/system/config.hpp	2012-05-21 09:39:58 EDT (Mon, 21 May 2012)
@@ -16,6 +16,23 @@
 // This header implements separate compilation features as described in
 // http://www.boost.org/more/separate_compilation.html
 
+//  normalize macros  ------------------------------------------------------------------//
+
+#if !defined(BOOST_SYSTEM_DYN_LINK) && !defined(BOOST_SYSTEM_STATIC_LINK) \
+  && !defined(BOOST_ALL_DYN_LINK) && !defined(BOOST_ALL_STATIC_LINK)
+# define BOOST_SYSTEM_STATIC_LINK
+#endif
+
+#if defined(BOOST_ALL_DYN_LINK) && !defined(BOOST_SYSTEM_DYN_LINK)
+# define BOOST_SYSTEM_DYN_LINK 
+#elif defined(BOOST_ALL_STATIC_LINK) && !defined(BOOST_SYSTEM_STATIC_LINK)
+# define BOOST_SYSTEM_STATIC_LINK 
+#endif
+
+#if defined(BOOST_SYSTEM_DYN_LINK) && defined(BOOST_SYSTEM_STATIC_LINK)
+# error Must not define both BOOST_SYSTEM_DYN_LINK and BOOST_SYSTEM_STATIC_LINK
+#endif
+
 //  enable dynamic or static linking as requested --------------------------------------//
 
 #if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_SYSTEM_DYN_LINK)

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	2012-05-21 09:39:58 EDT (Mon, 21 May 2012)
@@ -74,7 +74,7 @@
   // strerror_r is preferred because it is always thread safe,
   // however, we fallback to strerror in certain cases because:
   //   -- Windows doesn't provide strerror_r.
-  //   -- HP and Sundo provide strerror_r on newer systems, but there is
+  //   -- HP and Sun do provide strerror_r on newer systems, but there is
   //      no way to tell if is available at runtime and in any case their
   //      versions of strerror are thread safe anyhow.
   //   -- Linux only sometimes provides strerror_r.
@@ -84,6 +84,7 @@
   # if defined(BOOST_WINDOWS_API) || defined(__hpux) || defined(__sun)\
      || (defined(__linux) && (!defined(__USE_XOPEN2K) || defined(BOOST_SYSTEM_USE_STRERROR)))\
      || (defined(__osf__) && !defined(_REENTRANT))\
+     || (defined(__INTEGRITY))\
      || (defined(__vms))\
      || (defined(__QNXNTO__))
       const char * c_str = std::strerror( ev );

Modified: branches/release/libs/system/test/Jamfile.v2
==============================================================================
--- branches/release/libs/system/test/Jamfile.v2	(original)
+++ branches/release/libs/system/test/Jamfile.v2	2012-05-21 09:39:58 EDT (Mon, 21 May 2012)
@@ -16,6 +16,7 @@
    lib throw_test
      : throw_test.cpp
      : <link>shared:<define>BOOST_SYSTEM_DYN_LINK=1
+       <link>static:<define>BOOST_SYSTEM_STATIC_LINK=1
      ;