v2, v3, integration branch

[SVN r62649]
Use BOOST_NO_STATIC_ASSERT
2010-06-09 11:34:33 +00:00 · 2010-02-16 12:45:53 +00:00 · 2009-11-08 18:59:24 +00:00 · 2009-10-17 02:07:38 +00:00 · 2009-07-26 00:49:56 +00:00 · 2009-02-17 10:05:58 +00:00
5 changed files with 29 additions and 5 deletions
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@ -5,6 +5,8 @@

 using quickbook ;

+path-constant boost-images : ../../../doc/src/images ;
+
 xml static_assert : static_assert.qbk ;
 boostbook standalone
    :
@ -12,9 +14,31 @@ boostbook standalone
    :
        <xsl:param>nav.layout=none
        <xsl:param>navig.graphics=0
+        # PDF Options:
+        # TOC Generation: this is needed for FOP-0.9 and later:
+        <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!
+        <xsl:param>fop.extensions=0
+        # No indent on body text:
+        <xsl:param>body.start.indent=0pt
+        # Margin size:
+        <xsl:param>page.margin.inner=0.5in
+        # Margin size:
+        <xsl:param>page.margin.outer=0.5in
+        # Yes, we want graphics for admonishments:
+        <xsl:param>admon.graphics=1
+        # Set this one for PDF generation *only*:
+        # default pnd graphics are awful in PDF form,
+        # better use SVG's instead:
+        <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
    ;

 install html : ../../../doc/html/boostbook.css ;
 install ../ : ../../../boost.png ;


+
--- a/doc/static_assert.qbk
+++ b/doc/static_assert.qbk
@ -131,7 +131,7 @@ Suppose we have a template-class that requires an unsigned integral type with
 at least 16-bits of precision as a template argument, we can achieve this 
 using something like this:

-   #include <climits>
+   #include <limits>
   #include <boost/static_assert.hpp>

   template <class UnsignedInt>
--- a/include/boost/static_assert.hpp
+++ b/include/boost/static_assert.hpp
@ -38,7 +38,7 @@
 #  define BOOST_STATIC_ASSERT_BOOL_CAST(x) (bool)(x)
 #endif

-#ifdef BOOST_HAS_STATIC_ASSERT
+#ifndef BOOST_NO_STATIC_ASSERT
 #  define BOOST_STATIC_ASSERT( B ) static_assert(B, #B)
 #else

@ -125,7 +125,7 @@ template<int x> struct static_assert_test{};
   enum { BOOST_JOIN(boost_static_assert_enum_, __LINE__) \
      = sizeof(::boost::STATIC_ASSERTION_FAILURE< (bool)( B ) >) }
 #endif
-#endif // ndef BOOST_HAS_STATIC_ASSERT
+#endif // defined(BOOST_NO_STATIC_ASSERT)

 #endif // BOOST_STATIC_ASSERT_HPP

--- a/static_assert_example_2.cpp
+++ b/static_assert_example_2.cpp
@ -12,7 +12,7 @@
 #include <boost/type_traits.hpp>

 template <class RandomAccessIterator >
-RandomAccessIterator foo(RandomAccessIterator from, RandomAccessIterator to)
+RandomAccessIterator foo(RandomAccessIterator from, RandomAccessIterator /*to*/)
 {
   // this template can only be used with
   // random access iterators...
--- a/static_assert_example_3.cpp
+++ b/static_assert_example_3.cpp
@ -5,7 +5,7 @@

 //  See http://www.boost.org for most recent version including documentation.

-#include <climits>
+#include <limits>
 #include <boost/limits.hpp>
 #include <boost/static_assert.hpp>
Author	SHA1	Message	Date
Beman Dawes	4156b6d1db	v2, v3, integration branch [SVN r62649]	2010-06-09 11:34:33 +00:00
Beman Dawes	80c6340833	Use BOOST_NO_STATIC_ASSERT [SVN r59698]	2010-02-16 12:45:53 +00:00
John Maddock	138c5bde91	Fix gcc warning. [SVN r57495]	2009-11-08 18:59:24 +00:00
Troy D. Straszheim	5d9274a683	rm cmake from trunk. I'm not entirely sure this is necessary to satisfy the inspect script, but I'm not taking any chances, and it is easy to put back [SVN r56942]	2009-10-17 02:07:38 +00:00
Troy D. Straszheim	87ecd7d39f	Copyrights on CMakeLists.txt to keep them from clogging up the inspect reports. This is essentially the same commit as r55095 on the release branch. [SVN r55159]	2009-07-26 00:49:56 +00:00
John Maddock	62461d8848	Add PDF generation options to fix external links to point to the web site. Added a few more Boostbook based libs that were missed first time around. Fixed PDF naming issues. [SVN r51284]	2009-02-17 10:05:58 +00:00
John Maddock	a7e33291eb	Fix up PDF generation options. [SVN r50910]	2009-01-30 18:20:49 +00:00
John Maddock	413e7eda07	Fix inclusion of incorrect header. Fixes #2537. [SVN r50371]	2008-12-23 12:03:43 +00:00
Michael A. Jackson	a9a9f0591b	Updating dependency information for modularized libraries. [SVN r49628]	2008-11-07 17:05:27 +00:00
Michael A. Jackson	effe841116	Continuing merge of CMake build system files into trunk with the encouragement of Doug Gregor [SVN r49510]	2008-11-01 13:15:41 +00:00