Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r51412 - in branches/release: boost/tr1/detail boost/tr1/tr1 libs/tr1 libs/tr1/doc libs/tr1/test libs/tr1/test/cyclic_depend
From: john_at_[hidden]
Date: 2009-02-23 10:12:23

Author: johnmaddock
Date: 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
New Revision: 51412
URL: http://svn.boost.org/trac/boost/changeset/51412

Log:
Merge mostly config changes from trunk, plus fixes to newline file endings.
Added:
   branches/release/libs/tr1/CMakeLists.txt
      - copied unchanged from r51411, /trunk/libs/tr1/CMakeLists.txt
   branches/release/libs/tr1/module.cmake
      - copied unchanged from r51411, /trunk/libs/tr1/module.cmake
   branches/release/libs/tr1/test/CMakeLists.txt
      - copied unchanged from r51411, /trunk/libs/tr1/test/CMakeLists.txt
Text files modified:
   branches/release/boost/tr1/detail/config.hpp | 2 +-
   branches/release/boost/tr1/detail/config_all.hpp | 32 ++++++++++++++++++++++++++++----
   branches/release/boost/tr1/tr1/cmath | 2 +-
   branches/release/libs/tr1/doc/Jamfile.v2 | 10 ++++++++--
   branches/release/libs/tr1/test/cyclic_depend/function.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/function0.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/function1.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/function2.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/function3.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/function4.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/function5.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/function6.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/function7.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/function8.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/function9.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/hash.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/intrusive_ptr.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/make_tuple.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/math_special_functions.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/math_tr1.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/program_options.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/regex.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/tuple.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/tuple_fwd.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/tuple_tie.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/unordered_map.cpp | 2 +-
   branches/release/libs/tr1/test/cyclic_depend/unordered_set.cpp | 2 +-
   27 files changed, 61 insertions(+), 31 deletions(-)

Modified: branches/release/boost/tr1/detail/config.hpp
==============================================================================
--- branches/release/boost/tr1/detail/config.hpp (original)
+++ branches/release/boost/tr1/detail/config.hpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -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: branches/release/boost/tr1/detail/config_all.hpp
==============================================================================
--- branches/release/boost/tr1/detail/config_all.hpp (original)
+++ branches/release/boost/tr1/detail/config_all.hpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -42,6 +42,18 @@
//
#include <cstddef>

+// Including <cstdlib> allows us to use __GLIBCXX__ to
+// determine the version of the stdc++ library in use
+// under Darwin.
+#include <cstdlib>
+
+# 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:
@@ -65,14 +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>
# else
-# if ( ((__GNUC__ == 4 ) || (__GNUC_MINOR__ >= 3)) && defined(__APPLE_CC__))
+# if ( ((__GNUC__ == 3 ) && (__GNUC_MINOR__ >= 3)) && (defined(__APPLE_CC__) || defined(__CYGWIN__)))
# define BOOST_TR1_STD_HEADER(name) <../c++/name>
+# 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>
          /*
           * Before version 3.4.0 the 0 patch level was not part of the include path:
           */
@@ -85,10 +98,21 @@
# 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

+#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: branches/release/boost/tr1/tr1/cmath
==============================================================================
--- branches/release/boost/tr1/tr1/cmath (original)
+++ branches/release/boost/tr1/tr1/cmath 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -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

Modified: branches/release/libs/tr1/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/tr1/doc/Jamfile.v2 (original)
+++ branches/release/libs/tr1/doc/Jamfile.v2 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -4,7 +4,10 @@

using quickbook ;

+path-constant boost-images : ../../../doc/src/images ;
+
xml tr1 : tr1.qbk ;
+
boostbook standalone
     :
         tr1
@@ -31,7 +34,7 @@

         # PDF Options:
         # TOC Generation: this is needed for FOP-0.9 and later:
- #<xsl:param>fop1.extensions=1
+ <xsl:param>fop1.extensions=0
         # Or enable this if you're using XEP:
         <xsl:param>xep.extensions=1
         # TOC generation: this is needed for FOP 0.2, but must not be set to zero for FOP-0.9!
@@ -47,10 +50,13 @@
         # Set this one for PDF generation *only*:
         # default pnd graphics are awful in PDF form,
         # better use SVG's instead:
- #<xsl:param>admon.graphics.extension=".svg"
+ <format>pdf:<xsl:param>admon.graphics.extension=".svg"
+ <format>pdf:<xsl:param>admon.graphics.path=$(boost-images)/
+ <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
     ;

+

Modified: branches/release/libs/tr1/test/cyclic_depend/function.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/function.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/function.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/function0.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/function0.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/function0.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/function1.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/function1.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/function1.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/function2.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/function2.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/function2.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/function3.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/function3.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/function3.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/function4.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/function4.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/function4.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/function5.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/function5.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/function5.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/function6.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/function6.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/function6.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/function7.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/function7.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/function7.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/function8.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/function8.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/function8.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/function9.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/function9.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/function9.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/hash.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/hash.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/hash.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/intrusive_ptr.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/intrusive_ptr.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/intrusive_ptr.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/make_tuple.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/make_tuple.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/make_tuple.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/math_special_functions.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/math_special_functions.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/math_special_functions.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/math_tr1.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/math_tr1.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/math_tr1.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/program_options.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/program_options.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/program_options.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/regex.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/regex.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/regex.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/tuple.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/tuple.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/tuple.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/tuple_fwd.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/tuple_fwd.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/tuple_fwd.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/tuple_tie.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/tuple_tie.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/tuple_tie.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/unordered_map.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/unordered_map.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/unordered_map.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

Modified: branches/release/libs/tr1/test/cyclic_depend/unordered_set.cpp
==============================================================================
--- branches/release/libs/tr1/test/cyclic_depend/unordered_set.cpp (original)
+++ branches/release/libs/tr1/test/cyclic_depend/unordered_set.cpp 2009-02-23 10:12:20 EST (Mon, 23 Feb 2009)
@@ -9,4 +9,4 @@
int main()
{
return 0;
-}
\ No newline at end of file
+}

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