Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r85190 - trunk/boost/tr1/detail
From: john_at_[hidden]
Date: 2013-08-02 06:55:50


Author: johnmaddock
Date: 2013-08-02 06:55:50 EDT (Fri, 02 Aug 2013)
New Revision: 85190
URL: http://svn.boost.org/trac/boost/changeset/85190

Log:
Apply patch from #8944.
Fixes #8944.

Text files modified:
   trunk/boost/tr1/detail/config.hpp | 1 +
   trunk/boost/tr1/detail/config_all.hpp | 4 +++-
   2 files changed, 4 insertions(+), 1 deletions(-)

Modified: trunk/boost/tr1/detail/config.hpp
==============================================================================
--- trunk/boost/tr1/detail/config.hpp Fri Aug 2 05:40:23 2013 (r85189)
+++ trunk/boost/tr1/detail/config.hpp 2013-08-02 06:55:50 EDT (Fri, 02 Aug 2013) (r85190)
@@ -9,6 +9,7 @@
 #include <cstddef>
 
 #if (defined(__GNUC__) && !(defined(linux) || defined(__linux) || defined(__linux__))) \
+ || (!defined(__FreeBSD__)) \
    || (!defined(_AIX) && defined(__IBMCPP__) && (__IBMCPP__ >= 800))
    // Disable use of #include_next on Linux as typically we are installed in a
    // directory that is searched *after* the std lib include path.

Modified: trunk/boost/tr1/detail/config_all.hpp
==============================================================================
--- trunk/boost/tr1/detail/config_all.hpp Fri Aug 2 05:40:23 2013 (r85189)
+++ trunk/boost/tr1/detail/config_all.hpp 2013-08-02 06:55:50 EDT (Fri, 02 Aug 2013) (r85190)
@@ -92,6 +92,8 @@
 # elif defined(__GNUC__) && __GNUC__ >= 3
 # if defined(BOOST_TR1_GCC_INCLUDE_PATH)
 # define BOOST_TR1_STD_HEADER(name) <../BOOST_TR1_GCC_INCLUDE_PATH/name>
+# elif (defined(__FreeBSD__))
+# define BOOST_TR1_STD_HEADER(name) <../__GNUC__.__GNUC_MINOR__/name>
 # elif ( (__GNUC__ == 3 ) && ((__GNUC_MINOR__ == 0) || ((__GNUC_MINOR__ < 3) && defined(__APPLE_CC__))))
 # define BOOST_TR1_STD_HEADER(name) <../g++-v3/name>
 # else
@@ -114,7 +116,7 @@
 # endif
 
 # if !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT) && !defined(__ICC) \
- && (defined(linux) || defined(__linux) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__))
+ && (defined(__FreeBSD__) || 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


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk