Boost logo

Boost-Commit :

Date view Thread view Subject view Author view

Subject: [Boost-commit] svn:boost r59993 - in trunk/boost/tr1: . detail tr1
From: john_at_[hidden]
Date: 2010-02-28 11:57:20

Author: johnmaddock
Date: 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
New Revision: 59993
URL: http://svn.boost.org/trac/boost/changeset/59993

Log:
Change to honour BOOST_TR1_DISABLE_INCLUDE_NEXT.
Change to not set BOOST_HAS_INCLUDE_NEXT on Linux.
Fixes problems caused by having TR1 headers installed in /usr/include/boost when GCC's native TR1 implementation is enabled.
Text files modified:
   trunk/boost/tr1/array.hpp | 2 +-
   trunk/boost/tr1/cmath.hpp | 2 +-
   trunk/boost/tr1/complex.hpp | 2 +-
   trunk/boost/tr1/detail/config.hpp | 5 ++++-
   trunk/boost/tr1/functional.hpp | 2 +-
   trunk/boost/tr1/memory.hpp | 2 +-
   trunk/boost/tr1/random.hpp | 2 +-
   trunk/boost/tr1/regex.hpp | 2 +-
   trunk/boost/tr1/tr1/algorithm | 2 +-
   trunk/boost/tr1/tr1/array | 4 ++--
   trunk/boost/tr1/tr1/bitset | 2 +-
   trunk/boost/tr1/tr1/cmath | 2 +-
   trunk/boost/tr1/tr1/complex | 2 +-
   trunk/boost/tr1/tr1/deque | 2 +-
   trunk/boost/tr1/tr1/exception | 2 +-
   trunk/boost/tr1/tr1/fstream | 2 +-
   trunk/boost/tr1/tr1/functional | 2 +-
   trunk/boost/tr1/tr1/iomanip | 2 +-
   trunk/boost/tr1/tr1/ios | 2 +-
   trunk/boost/tr1/tr1/iostream | 2 +-
   trunk/boost/tr1/tr1/istream | 2 +-
   trunk/boost/tr1/tr1/iterator | 2 +-
   trunk/boost/tr1/tr1/limits | 2 +-
   trunk/boost/tr1/tr1/list | 2 +-
   trunk/boost/tr1/tr1/locale | 2 +-
   trunk/boost/tr1/tr1/map | 2 +-
   trunk/boost/tr1/tr1/memory | 2 +-
   trunk/boost/tr1/tr1/new | 2 +-
   trunk/boost/tr1/tr1/numeric | 2 +-
   trunk/boost/tr1/tr1/ostream | 2 +-
   trunk/boost/tr1/tr1/queue | 2 +-
   trunk/boost/tr1/tr1/random | 4 ++--
   trunk/boost/tr1/tr1/regex | 2 +-
   trunk/boost/tr1/tr1/set | 2 +-
   trunk/boost/tr1/tr1/sstream | 2 +-
   trunk/boost/tr1/tr1/stack | 2 +-
   trunk/boost/tr1/tr1/stdexcept | 2 +-
   trunk/boost/tr1/tr1/streambuf | 2 +-
   trunk/boost/tr1/tr1/string | 2 +-
   trunk/boost/tr1/tr1/strstream | 4 +++-
   trunk/boost/tr1/tr1/tuple | 4 ++--
   trunk/boost/tr1/tr1/type_traits | 2 +-
   trunk/boost/tr1/tr1/typeinfo | 2 +-
   trunk/boost/tr1/tr1/unordered_map | 4 ++--
   trunk/boost/tr1/tr1/unordered_set | 4 ++--
   trunk/boost/tr1/tr1/utility | 2 +-
   trunk/boost/tr1/tr1/valarray | 2 +-
   trunk/boost/tr1/tr1/vector | 2 +-
   trunk/boost/tr1/tuple.hpp | 2 +-
   trunk/boost/tr1/type_traits.hpp | 2 +-
   trunk/boost/tr1/unordered_map.hpp | 2 +-
   trunk/boost/tr1/unordered_set.hpp | 2 +-
   trunk/boost/tr1/utility.hpp | 2 +-
   53 files changed, 63 insertions(+), 58 deletions(-)

Modified: trunk/boost/tr1/array.hpp
==============================================================================
--- trunk/boost/tr1/array.hpp (original)
+++ trunk/boost/tr1/array.hpp 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -9,7 +9,7 @@
 
 #ifdef BOOST_HAS_TR1_ARRAY
 
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(array)
 # else
 # include <boost/tr1/detail/config_all.hpp>

Modified: trunk/boost/tr1/cmath.hpp
==============================================================================
--- trunk/boost/tr1/cmath.hpp (original)
+++ trunk/boost/tr1/cmath.hpp 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -9,7 +9,7 @@
 
 #ifdef BOOST_HAS_TR1_CMATH
 
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(cmath)
 # else
 # include <boost/tr1/detail/config_all.hpp>

Modified: trunk/boost/tr1/complex.hpp
==============================================================================
--- trunk/boost/tr1/complex.hpp (original)
+++ trunk/boost/tr1/complex.hpp 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -27,7 +27,7 @@
 
 #else
 
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(complex)
 # else
 # include <boost/tr1/detail/config_all.hpp>

Modified: trunk/boost/tr1/detail/config.hpp
==============================================================================
--- trunk/boost/tr1/detail/config.hpp (original)
+++ trunk/boost/tr1/detail/config.hpp 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -8,7 +8,10 @@
 
 #include <cstddef>
 
-#if defined(__GNUC__) || (!defined(_AIX) && defined(__IBMCPP__) && (__IBMCPP__ >= 800))
+#if (defined(__GNUC__) && !(defined(linux) || defined(__linux) || defined(__linux__))) \
+ || (!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.
 #if !defined(BOOST_HAS_INCLUDE_NEXT)
 # define BOOST_HAS_INCLUDE_NEXT
 #endif

Modified: trunk/boost/tr1/functional.hpp
==============================================================================
--- trunk/boost/tr1/functional.hpp (original)
+++ trunk/boost/tr1/functional.hpp 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
    || defined(BOOST_HAS_TR1_BIND)\
    || defined(BOOST_HAS_TR1_FUNCTION)\
    || defined(BOOST_HAS_TR1_HASH)
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(functional)
 # else
 # include <boost/tr1/detail/config_all.hpp>

Modified: trunk/boost/tr1/memory.hpp
==============================================================================
--- trunk/boost/tr1/memory.hpp (original)
+++ trunk/boost/tr1/memory.hpp 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -59,7 +59,7 @@
 
 #else
 
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(memory)
 # else
 # include <boost/tr1/detail/config_all.hpp>

Modified: trunk/boost/tr1/random.hpp
==============================================================================
--- trunk/boost/tr1/random.hpp (original)
+++ trunk/boost/tr1/random.hpp 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -9,7 +9,7 @@
 # include <boost/tr1/detail/config.hpp>
 
 #ifdef BOOST_HAS_TR1_RANDOM
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(random)
 # else
 # include <boost/tr1/detail/config_all.hpp>

Modified: trunk/boost/tr1/regex.hpp
==============================================================================
--- trunk/boost/tr1/regex.hpp (original)
+++ trunk/boost/tr1/regex.hpp 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -9,7 +9,7 @@
 
 #ifdef BOOST_HAS_TR1_REGEX
 
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(regex)
 # else
 # include <boost/tr1/detail/config_all.hpp>

Modified: trunk/boost/tr1/tr1/algorithm
==============================================================================
--- trunk/boost/tr1/tr1/algorithm (original)
+++ trunk/boost/tr1/tr1/algorithm 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_algorithm_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <algorithm>
 # else
 # include BOOST_TR1_STD_HEADER(algorithm)

Modified: trunk/boost/tr1/tr1/array
==============================================================================
--- trunk/boost/tr1/tr1/array (original)
+++ trunk/boost/tr1/tr1/array 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -9,7 +9,7 @@
 # include <boost/tr1/detail/config_all.hpp>
 
 # ifdef BOOST_HAS_CPP_0X
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <array>
 # else
 # include BOOST_TR1_STD_HEADER(array)
@@ -19,7 +19,7 @@
 # if !defined(BOOST_TR1_NO_RECURSION)
 # define BOOST_TR1_NO_RECURSION
 # ifdef BOOST_HAS_TR1_ARRAY
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(array)
 # else
 # include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(array))

Modified: trunk/boost/tr1/tr1/bitset
==============================================================================
--- trunk/boost/tr1/tr1/bitset (original)
+++ trunk/boost/tr1/tr1/bitset 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_bitset_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <bitset>
 # else
 # include BOOST_TR1_STD_HEADER(bitset)

Modified: trunk/boost/tr1/tr1/cmath
==============================================================================
--- trunk/boost/tr1/tr1/cmath (original)
+++ trunk/boost/tr1/tr1/cmath 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -17,7 +17,7 @@
 # define BOOST_TR1_NO_CMATH_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <cmath>
 # else
 # include BOOST_TR1_STD_CHEADER(cmath)

Modified: trunk/boost/tr1/tr1/complex
==============================================================================
--- trunk/boost/tr1/tr1/complex (original)
+++ trunk/boost/tr1/tr1/complex 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -11,7 +11,7 @@
 # define BOOST_TR1_NO_COMPLEX_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <complex>
 # else
 # include BOOST_TR1_STD_HEADER(complex)

Modified: trunk/boost/tr1/tr1/deque
==============================================================================
--- trunk/boost/tr1/tr1/deque (original)
+++ trunk/boost/tr1/tr1/deque 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_deque_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <deque>
 # else
 # include BOOST_TR1_STD_HEADER(deque)

Modified: trunk/boost/tr1/tr1/exception
==============================================================================
--- trunk/boost/tr1/tr1/exception (original)
+++ trunk/boost/tr1/tr1/exception 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -21,7 +21,7 @@
 #endif
 
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <exception>
 # else
 # include BOOST_TR1_STD_HEADER(exception)

Modified: trunk/boost/tr1/tr1/fstream
==============================================================================
--- trunk/boost/tr1/tr1/fstream (original)
+++ trunk/boost/tr1/tr1/fstream 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_fstream_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <fstream>
 # else
 # include BOOST_TR1_STD_HEADER(fstream)

Modified: trunk/boost/tr1/tr1/functional
==============================================================================
--- trunk/boost/tr1/tr1/functional (original)
+++ trunk/boost/tr1/tr1/functional 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -10,7 +10,7 @@
 # define BOOST_TR1_NO_FUNCTIONAL_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <functional>
 # else
 # include BOOST_TR1_STD_HEADER(functional)

Modified: trunk/boost/tr1/tr1/iomanip
==============================================================================
--- trunk/boost/tr1/tr1/iomanip (original)
+++ trunk/boost/tr1/tr1/iomanip 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_iomanip_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <iomanip>
 # else
 # include BOOST_TR1_STD_HEADER(iomanip)

Modified: trunk/boost/tr1/tr1/ios
==============================================================================
--- trunk/boost/tr1/tr1/ios (original)
+++ trunk/boost/tr1/tr1/ios 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_ios_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <ios>
 # else
 # include BOOST_TR1_STD_HEADER(ios)

Modified: trunk/boost/tr1/tr1/iostream
==============================================================================
--- trunk/boost/tr1/tr1/iostream (original)
+++ trunk/boost/tr1/tr1/iostream 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_iostream_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <iostream>
 # else
 # include BOOST_TR1_STD_HEADER(iostream)

Modified: trunk/boost/tr1/tr1/istream
==============================================================================
--- trunk/boost/tr1/tr1/istream (original)
+++ trunk/boost/tr1/tr1/istream 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_istream_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <istream>
 # else
 # include BOOST_TR1_STD_HEADER(istream)

Modified: trunk/boost/tr1/tr1/iterator
==============================================================================
--- trunk/boost/tr1/tr1/iterator (original)
+++ trunk/boost/tr1/tr1/iterator 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_iterator_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <iterator>
 # else
 # include BOOST_TR1_STD_HEADER(iterator)

Modified: trunk/boost/tr1/tr1/limits
==============================================================================
--- trunk/boost/tr1/tr1/limits (original)
+++ trunk/boost/tr1/tr1/limits 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_limits_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <limits>
 # else
 # include BOOST_TR1_STD_HEADER(limits)

Modified: trunk/boost/tr1/tr1/list
==============================================================================
--- trunk/boost/tr1/tr1/list (original)
+++ trunk/boost/tr1/tr1/list 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_list_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <list>
 # else
 # include BOOST_TR1_STD_HEADER(list)

Modified: trunk/boost/tr1/tr1/locale
==============================================================================
--- trunk/boost/tr1/tr1/locale (original)
+++ trunk/boost/tr1/tr1/locale 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_locale_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <locale>
 # else
 # include BOOST_TR1_STD_HEADER(locale)

Modified: trunk/boost/tr1/tr1/map
==============================================================================
--- trunk/boost/tr1/tr1/map (original)
+++ trunk/boost/tr1/tr1/map 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_map_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <map>
 # else
 # include BOOST_TR1_STD_HEADER(map)

Modified: trunk/boost/tr1/tr1/memory
==============================================================================
--- trunk/boost/tr1/tr1/memory (original)
+++ trunk/boost/tr1/tr1/memory 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -11,7 +11,7 @@
 # define BOOST_TR1_NO_MEMORY_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <memory>
 # else
 # include BOOST_TR1_STD_HEADER(memory)

Modified: trunk/boost/tr1/tr1/new
==============================================================================
--- trunk/boost/tr1/tr1/new (original)
+++ trunk/boost/tr1/tr1/new 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -17,7 +17,7 @@
 #endif
 
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <new>
 # else
 # include BOOST_TR1_STD_HEADER(new)

Modified: trunk/boost/tr1/tr1/numeric
==============================================================================
--- trunk/boost/tr1/tr1/numeric (original)
+++ trunk/boost/tr1/tr1/numeric 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_numeric_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <numeric>
 # else
 # include BOOST_TR1_STD_HEADER(numeric)

Modified: trunk/boost/tr1/tr1/ostream
==============================================================================
--- trunk/boost/tr1/tr1/ostream (original)
+++ trunk/boost/tr1/tr1/ostream 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_ostream_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <ostream>
 # else
 # include BOOST_TR1_STD_HEADER(ostream)

Modified: trunk/boost/tr1/tr1/queue
==============================================================================
--- trunk/boost/tr1/tr1/queue (original)
+++ trunk/boost/tr1/tr1/queue 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_queue_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <queue>
 # else
 # include BOOST_TR1_STD_HEADER(queue)

Modified: trunk/boost/tr1/tr1/random
==============================================================================
--- trunk/boost/tr1/tr1/random (original)
+++ trunk/boost/tr1/tr1/random 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -9,7 +9,7 @@
 # include <boost/tr1/detail/config_all.hpp>
 
 # ifdef BOOST_HAS_CPP_0X
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <random>
 # else
 # include BOOST_TR1_STD_HEADER(random)
@@ -19,7 +19,7 @@
 # if !defined(BOOST_TR1_NO_RECURSION)
 # define BOOST_TR1_NO_RECURSION
 # ifdef BOOST_HAS_TR1_RANDOM
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(random)
 # else
 # include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(random))

Modified: trunk/boost/tr1/tr1/regex
==============================================================================
--- trunk/boost/tr1/tr1/regex (original)
+++ trunk/boost/tr1/tr1/regex 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -9,7 +9,7 @@
 # define BOOST_TR1_NO_RECURSION
 # include <boost/tr1/detail/config_all.hpp>
 # ifdef BOOST_HAS_TR1_REGEX
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(regex)
 # else
 # include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(regex))

Modified: trunk/boost/tr1/tr1/set
==============================================================================
--- trunk/boost/tr1/tr1/set (original)
+++ trunk/boost/tr1/tr1/set 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_set_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <set>
 # else
 # include BOOST_TR1_STD_HEADER(set)

Modified: trunk/boost/tr1/tr1/sstream
==============================================================================
--- trunk/boost/tr1/tr1/sstream (original)
+++ trunk/boost/tr1/tr1/sstream 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_sstream_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <sstream>
 # else
 # include BOOST_TR1_STD_HEADER(sstream)

Modified: trunk/boost/tr1/tr1/stack
==============================================================================
--- trunk/boost/tr1/tr1/stack (original)
+++ trunk/boost/tr1/tr1/stack 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_stack_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <stack>
 # else
 # include BOOST_TR1_STD_HEADER(stack)

Modified: trunk/boost/tr1/tr1/stdexcept
==============================================================================
--- trunk/boost/tr1/tr1/stdexcept (original)
+++ trunk/boost/tr1/tr1/stdexcept 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -17,7 +17,7 @@
 #endif
 
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <stdexcept>
 # else
 # include BOOST_TR1_STD_HEADER(stdexcept)

Modified: trunk/boost/tr1/tr1/streambuf
==============================================================================
--- trunk/boost/tr1/tr1/streambuf (original)
+++ trunk/boost/tr1/tr1/streambuf 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_streambuf_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <streambuf>
 # else
 # include BOOST_TR1_STD_HEADER(streambuf)

Modified: trunk/boost/tr1/tr1/string
==============================================================================
--- trunk/boost/tr1/tr1/string (original)
+++ trunk/boost/tr1/tr1/string 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_string_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <string>
 # else
 # include BOOST_TR1_STD_HEADER(string)

Modified: trunk/boost/tr1/tr1/strstream
==============================================================================
--- trunk/boost/tr1/tr1/strstream (original)
+++ trunk/boost/tr1/tr1/strstream 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,8 +14,10 @@
 # define BOOST_TR1_NO_strstream_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <strstream>
+# elif defined(__GNUC__) && (__GNUC__ >= 4) && defined(__GLIBCXX__) && !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
+# include <backward/strstream>
 # else
 # include BOOST_TR1_STD_HEADER(strstream)
 # endif

Modified: trunk/boost/tr1/tr1/tuple
==============================================================================
--- trunk/boost/tr1/tr1/tuple (original)
+++ trunk/boost/tr1/tr1/tuple 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -9,7 +9,7 @@
 # include <boost/tr1/detail/config_all.hpp>
 
 # ifdef BOOST_HAS_CPP_0X
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <tuple>
 # else
 # include BOOST_TR1_STD_HEADER(tuple)
@@ -19,7 +19,7 @@
 # if !defined(BOOST_TR1_NO_RECURSION)
 # define BOOST_TR1_NO_RECURSION
 # ifdef BOOST_HAS_TR1_TUPLE
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(tuple)
 # else
 # include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(tuple))

Modified: trunk/boost/tr1/tr1/type_traits
==============================================================================
--- trunk/boost/tr1/tr1/type_traits (original)
+++ trunk/boost/tr1/tr1/type_traits 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -18,7 +18,7 @@
 # define BOOST_TR1_NO_RECURSION
 # define BOOST_TR1_NO_TYPE_TRAITS_RECURSION
 # endif
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <type_traits>
 # else
 # include BOOST_TR1_STD_HEADER(type_traits)

Modified: trunk/boost/tr1/tr1/typeinfo
==============================================================================
--- trunk/boost/tr1/tr1/typeinfo (original)
+++ trunk/boost/tr1/tr1/typeinfo 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_typeinfo_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <typeinfo>
 # else
 # include BOOST_TR1_STD_HEADER(typeinfo)

Modified: trunk/boost/tr1/tr1/unordered_map
==============================================================================
--- trunk/boost/tr1/tr1/unordered_map (original)
+++ trunk/boost/tr1/tr1/unordered_map 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -9,7 +9,7 @@
 # include <boost/tr1/detail/config_all.hpp>
 
 # ifdef BOOST_HAS_CPP_0X
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <unordered_map>
 # else
 # include BOOST_TR1_STD_HEADER(unordered_map)
@@ -19,7 +19,7 @@
 # if !defined(BOOST_TR1_NO_RECURSION)
 # define BOOST_TR1_NO_RECURSION
 # ifdef BOOST_HAS_TR1_UNORDERED_MAP
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(unordered_map)
 # else
 # include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(unordered_map))

Modified: trunk/boost/tr1/tr1/unordered_set
==============================================================================
--- trunk/boost/tr1/tr1/unordered_set (original)
+++ trunk/boost/tr1/tr1/unordered_set 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -9,7 +9,7 @@
 # include <boost/tr1/detail/config_all.hpp>
 
 # ifdef BOOST_HAS_CPP_0X
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <unordered_map>
 # else
 # include BOOST_TR1_STD_HEADER(unordered_map)
@@ -19,7 +19,7 @@
 # if !defined(BOOST_TR1_NO_RECURSION)
 # define BOOST_TR1_NO_RECURSION
 # ifdef BOOST_HAS_TR1_UNORDERED_SET
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(unordered_set)
 # else
 # include BOOST_TR1_STD_HEADER(BOOST_TR1_PATH(unordered_set))

Modified: trunk/boost/tr1/tr1/utility
==============================================================================
--- trunk/boost/tr1/tr1/utility (original)
+++ trunk/boost/tr1/tr1/utility 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -17,7 +17,7 @@
 # define BOOST_TR1_NO_UTILITY_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# 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/tr1/valarray
==============================================================================
--- trunk/boost/tr1/tr1/valarray (original)
+++ trunk/boost/tr1/tr1/valarray 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_valarray_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <valarray>
 # else
 # include BOOST_TR1_STD_HEADER(valarray)

Modified: trunk/boost/tr1/tr1/vector
==============================================================================
--- trunk/boost/tr1/tr1/vector (original)
+++ trunk/boost/tr1/tr1/vector 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -14,7 +14,7 @@
 # define BOOST_TR1_NO_vector_RECURSION
 # endif
 # include <boost/tr1/detail/config_all.hpp>
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next <vector>
 # else
 # include BOOST_TR1_STD_HEADER(vector)

Modified: trunk/boost/tr1/tuple.hpp
==============================================================================
--- trunk/boost/tr1/tuple.hpp (original)
+++ trunk/boost/tr1/tuple.hpp 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -9,7 +9,7 @@
 
 #ifdef BOOST_HAS_TR1_TUPLE
 
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(tuple)
 # else
 # include <boost/tr1/detail/config_all.hpp>

Modified: trunk/boost/tr1/type_traits.hpp
==============================================================================
--- trunk/boost/tr1/type_traits.hpp (original)
+++ trunk/boost/tr1/type_traits.hpp 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -9,7 +9,7 @@
 
 #ifdef BOOST_HAS_TR1_TYPE_TRAITS
 
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(type_traits)
 # else
 # include <boost/tr1/detail/config_all.hpp>

Modified: trunk/boost/tr1/unordered_map.hpp
==============================================================================
--- trunk/boost/tr1/unordered_map.hpp (original)
+++ trunk/boost/tr1/unordered_map.hpp 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -9,7 +9,7 @@
 
 #ifdef BOOST_HAS_TR1_UNORDERED_MAP
 
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(unordered_map)
 # else
 # include <boost/tr1/detail/config_all.hpp>

Modified: trunk/boost/tr1/unordered_set.hpp
==============================================================================
--- trunk/boost/tr1/unordered_set.hpp (original)
+++ trunk/boost/tr1/unordered_set.hpp 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -9,7 +9,7 @@
 
 #ifdef BOOST_HAS_TR1_UNORDERED_SET
 
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(unordered_set)
 # else
 # include <boost/tr1/detail/config_all.hpp>

Modified: trunk/boost/tr1/utility.hpp
==============================================================================
--- trunk/boost/tr1/utility.hpp (original)
+++ trunk/boost/tr1/utility.hpp 2010-02-28 11:57:15 EST (Sun, 28 Feb 2010)
@@ -9,7 +9,7 @@
 
 #ifdef BOOST_HAS_TR1_UTILITY
 
-# ifdef BOOST_HAS_INCLUDE_NEXT
+# if defined(BOOST_HAS_INCLUDE_NEXT) && !defined(BOOST_TR1_DISABLE_INCLUDE_NEXT)
 # include_next BOOST_TR1_HEADER(utility)
 # else
 # include <boost/tr1/detail/config_all.hpp>

Date view Thread view Subject view Author view

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