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

Subject: [Boost-commit] svn:boost r51219 - trunk/boost/tr1/detail
From: john_at_[hidden]
Date: 2009-02-12 09:04:18

Author: johnmaddock
Date: 2009-02-12 09:04:18 EST (Thu, 12 Feb 2009)
New Revision: 51219
URL: http://svn.boost.org/trac/boost/changeset/51219

Log:
Revert to using #include_next for gcc unless we're in a situation where we know it's likely to cause a problem.
Text files modified: 
   trunk/boost/tr1/detail/config_all.hpp |    25 +++++++------------------               
   1 files changed, 7 insertions(+), 18 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-02-12 09:04:18 EST (Thu, 12 Feb 2009)
@@ -77,27 +77,15 @@
 #  elif defined(__GNUC__) && __GNUC__ >= 3
 #    if defined(BOOST_TR1_GCC_INCLUDE_PATH)
 #      define BOOST_TR1_STD_HEADER(name) <../BOOST_TR1_GCC_INCLUDE_PATH/name>
-#      ifndef BOOST_TR1_DISABLE_INCLUDE_NEXT
-#        define BOOST_TR1_DISABLE_INCLUDE_NEXT
-#      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__ == 3 ) && (__GNUC_MINOR__ >= 3)) && (defined(__APPLE_CC__) || defined(__CYGWIN__)))
 #        define BOOST_TR1_STD_HEADER(name) <../c++/name>
-#        if !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT) && !defined(__ICC)
-#          define BOOST_TR1_DISABLE_INCLUDE_NEXT
-#        endif
 #      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>
-#        if !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT) && !defined(__ICC)
-#          define BOOST_TR1_DISABLE_INCLUDE_NEXT
-#        endif
          /*
           *  Before version 3.4.0 the 0 patch level was not part of the include path:
           */
@@ -105,17 +93,18 @@
                                               (__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>
-#        if !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT) && !(defined(__ICC) && defined(__APPLE__))
-#          define BOOST_TR1_DISABLE_INCLUDE_NEXT
-#        endif
 #      endif
 #    endif
 
+#      if !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT) && !defined(__ICC) \
+            && (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__))
+         // Disable use of #include_next on Linux as typically we are installed in a directory that is searched
+         // *after* the std lib include path:
+#        define BOOST_TR1_DISABLE_INCLUDE_NEXT
+#      endif
+
 #  else
 #     define BOOST_TR1_STD_HEADER(name) <../include/name>
 #  endif