[Boost-commit] svn:boost r49759 - in trunk/boost/tr1: . detail tr1

Subject: [Boost-commit] svn:boost r49759 - in trunk/boost/tr1: . detail tr1
From: john_at_[hidden]
Date: 2008-11-14 13:01:52

Author: johnmaddock
Date: 2008-11-14 13:01:51 EST (Fri, 14 Nov 2008)
New Revision: 49759
URL: http://svn.boost.org/trac/boost/changeset/49759

Log:
Try and fix Apache std lib configuration issues.
Text files modified: 
   trunk/boost/tr1/cmath.hpp             |     4 ++--                                    
   trunk/boost/tr1/detail/config_all.hpp |    11 +++++++++++                             
   trunk/boost/tr1/tr1/cmath             |     2 +-                                      
   3 files changed, 14 insertions(+), 3 deletions(-)

Modified: trunk/boost/tr1/cmath.hpp
==============================================================================
--- trunk/boost/tr1/cmath.hpp	(original)
+++ trunk/boost/tr1/cmath.hpp	2008-11-14 13:01:51 EST (Fri, 14 Nov 2008)
@@ -10,10 +10,10 @@
 #ifdef BOOST_HAS_TR1_CMATH
 
 #  ifdef BOOST_HAS_INCLUDE_NEXT
-#     include_next BOOST_TR1_HEADER(cmath)
+#     include_next BOOST_TR1_CHEADER(cmath)
 #  else
 #     include <boost/tr1/detail/config_all.hpp>
-#     include BOOST_TR1_HEADER(cmath)
+#     include BOOST_TR1_CHEADER(cmath)
 #  endif
 
 #else

Modified: trunk/boost/tr1/detail/config_all.hpp
==============================================================================
--- trunk/boost/tr1/detail/config_all.hpp	(original)
+++ trunk/boost/tr1/detail/config_all.hpp	2008-11-14 13:01:51 EST (Fri, 14 Nov 2008)
@@ -42,6 +42,13 @@
 //
 #include <cstddef>
 
+#  if defined(_RWSTD_VER) && _RWSTD_VER >= 0x04010200
+#     if !defined (__SUNPRO_CC) && !defined (__DECCXX)
+#        define BOOST_TR1_STD_CHEADER(name) <../include/ansi/name>
+#     endif
+#  endif
+
+
 #  if (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)) && !defined(__BORLANDC__)
 #     ifdef __SUNPRO_CC
          // can't use <../stlport/name> since some compilers put stlport in a different directory:
@@ -89,6 +96,10 @@
 #     define BOOST_TR1_STD_HEADER(name) <../include/name>
 #  endif
 
+#if !defined(BOOST_TR1_STD_CHEADER)
+#  define BOOST_TR1_STD_CHEADER(name) BOOST_TR1_STD_HEADER(name)
+#endif
+
 #if defined(__GNUC__) && !defined(BOOST_HAS_INCLUDE_NEXT)
 #  define BOOST_HAS_INCLUDE_NEXT
 #endif

Modified: trunk/boost/tr1/tr1/cmath
==============================================================================
--- trunk/boost/tr1/tr1/cmath	(original)
+++ trunk/boost/tr1/tr1/cmath	2008-11-14 13:01:51 EST (Fri, 14 Nov 2008)
@@ -20,7 +20,7 @@
 #  ifdef BOOST_HAS_INCLUDE_NEXT
 #     include_next <cmath>
 #  else
-#     include BOOST_TR1_STD_HEADER(cmath)
+#     include BOOST_TR1_STD_CHEADER(cmath)
 #  endif
 #ifdef BOOST_TR1_NO_CMATH_RECURSION3
 #  undef BOOST_TR1_NO_CMATH_RECURSION3