[Boost-commit] svn:boost r50605 - trunk/boost/tr1/detail

Subject: [Boost-commit] svn:boost r50605 - trunk/boost/tr1/detail
From: john_at_[hidden]
Date: 2009-01-15 04:37:31

Author: johnmaddock
Date: 2009-01-15 04:37:30 EST (Thu, 15 Jan 2009)
New Revision: 50605
URL: http://svn.boost.org/trac/boost/changeset/50605

Log:
Apply Darwin patch from Stuart Malone.
Text files modified: 
   trunk/boost/tr1/detail/config_all.hpp |     7 ++++++-                                 
   1 files changed, 6 insertions(+), 1 deletions(-)

Modified: trunk/boost/tr1/detail/config_all.hpp
==============================================================================
--- trunk/boost/tr1/detail/config_all.hpp	(original)
+++ trunk/boost/tr1/detail/config_all.hpp	2009-01-15 04:37:30 EST (Thu, 15 Jan 2009)
@@ -42,6 +42,11 @@
 //
 #include <cstddef>
 
+// Including <cstdlib> allows us to use __GLIBCXX__ to
+// determine the version of the stdc++ library in use
+// under Darwin.
+#include <cstdlib>
+
 #  if defined(_RWSTD_VER) && _RWSTD_VER >= 0x04010200
 #     if !defined (__SUNPRO_CC) && !defined (__DECCXX)
 #        define BOOST_TR1_STD_CHEADER(name) <../include/ansi/name>
@@ -86,7 +91,7 @@
 #        ifndef BOOST_TR1_DISABLE_INCLUDE_NEXT
 #          define BOOST_TR1_DISABLE_INCLUDE_NEXT
 #        endif
-#      elif (__GLIBCXX__ == 20050421)
+#      elif ((__GLIBCXX__ == 20050421) && defined(__APPLE_CC__))
          // Some Darwin tools fix libstdc++ at 4.0.0 irrespective of the actual
          // compiler version:
 #        define BOOST_TR1_STD_HEADER(name) <../4.0.0/name>