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

Subject: [Boost-commit] svn:boost r50412 - trunk/boost/tr1/detail
From: john_at_[hidden]
Date: 2008-12-30 12:18:02

Author: johnmaddock
Date: 2008-12-30 12:18:01 EST (Tue, 30 Dec 2008)
New Revision: 50412
URL: http://svn.boost.org/trac/boost/changeset/50412

Log:
Change GCC setup so that we don't get compile failures if the library is installed in /usr/include/
Text files modified: 
   trunk/boost/tr1/detail/config.hpp     |     2 +-                                      
   trunk/boost/tr1/detail/config_all.hpp |    12 ++++++++++++                            
   2 files changed, 13 insertions(+), 1 deletions(-)

Modified: trunk/boost/tr1/detail/config.hpp
==============================================================================
--- trunk/boost/tr1/detail/config.hpp	(original)
+++ trunk/boost/tr1/detail/config.hpp	2008-12-30 12:18:01 EST (Tue, 30 Dec 2008)
@@ -21,7 +21,7 @@
 #     define BOOST_TR1_NO_RECURSION
 #     define BOOST_TR1_NO_CONFIG_RECURSION
 #  endif
-#  ifdef BOOST_HAS_INCLUDE_NEXT
+#  if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 #     include_next <utility>
 #  else
 #     include BOOST_TR1_STD_HEADER(utility)

Modified: trunk/boost/tr1/detail/config_all.hpp
==============================================================================
--- trunk/boost/tr1/detail/config_all.hpp	(original)
+++ trunk/boost/tr1/detail/config_all.hpp	2008-12-30 12:18:01 EST (Tue, 30 Dec 2008)
@@ -77,9 +77,15 @@
 #      endif
 #    elif ( (__GNUC__ == 3 ) && ((__GNUC_MINOR__ == 0) || ((__GNUC_MINOR__ < 3) && defined(__APPLE_CC__))))
 #      define BOOST_TR1_STD_HEADER(name) <../g++-v3/name>
+#      ifndef BOOST_TR1_DISABLE_INCLUDE_NEXT
+#        define BOOST_TR1_DISABLE_INCLUDE_NEXT
+#      endif
 #    else
 #      if ( ((__GNUC__ == 4 ) || (__GNUC_MINOR__ >= 3)) && defined(__APPLE_CC__))
 #        define BOOST_TR1_STD_HEADER(name) <../c++/name>
+#        ifndef BOOST_TR1_DISABLE_INCLUDE_NEXT
+#          define BOOST_TR1_DISABLE_INCLUDE_NEXT
+#        endif
          /*
           *  Before version 3.4.0 the 0 patch level was not part of the include path:
           */
@@ -87,8 +93,14 @@
                                               (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
                                               (__GNUC__ > 3))
 #        define BOOST_TR1_STD_HEADER(name) <../__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__/name>
+#        ifndef BOOST_TR1_DISABLE_INCLUDE_NEXT
+#          define BOOST_TR1_DISABLE_INCLUDE_NEXT
+#        endif
 #      else
 #        define BOOST_TR1_STD_HEADER(name) <../__GNUC__.__GNUC_MINOR__/name>
+#        ifndef BOOST_TR1_DISABLE_INCLUDE_NEXT
+#          define BOOST_TR1_DISABLE_INCLUDE_NEXT
+#        endif
 #      endif
 #    endif