Branch for Iostreams development

[SVN r42144]

doc/integer_mask.html

@@ -196,7 +196,7 @@ contaimination of values by the higher, unused bits.</p>
 <h2><a name="credits">Credits</a></h2>
 
 <p>The author of the Boost bit mask class templates is <a
-href="http://www.boost.org/people/daryle_walker.html">Daryle Walker</a>.</p>
+href="../../../people/daryle_walker.html">Daryle Walker</a>.</p>
 
 <hr>
 

doc/static_log2.html

@@ -186,7 +186,7 @@ code (and update old code as soon as possible).
 
 
 <p>The original version of the Boost binary logarithm class template was
-written by <a href="http://www.boost.org/people/daryle_walker.html">Daryle Walker</a>
+written by <a href="../../../people/daryle_walker.html">Daryle Walker</a>
 and then enhanced by Giovanni Bajo with support for compilers without
 partial template specialization. The current version was suggested,
 together with a reference implementation, by Vesa Karvonen. Gennaro Prota

doc/static_min_max.html

@@ -106,7 +106,7 @@ class template.</p>
 <h2><a name="credits">Credits</a></h2>
 
 <p>The author of the Boost compile-time extrema class templates is <a
-href="http://www.boost.org/people/daryle_walker.html">Daryle Walker</a>.</p>
+href="../../../people/daryle_walker.html">Daryle Walker</a>.</p>
 
 <hr>
 

include/boost/cstdint.hpp

@@ -36,7 +36,7 @@
       // this is triggered with GCC, because it defines __cplusplus < 199707L
 #     define BOOST_NO_INT64_T
 #   endif 
-# elif defined(__FreeBSD__) || defined(__IBMCPP__) || defined(_AIX)
+# elif defined(__FreeBSD__) || defined(__IBMCPP__)
 #   include <inttypes.h>
 # else
 #   include <stdint.h>

include/boost/integer/static_log2.hpp

@@ -48,7 +48,7 @@ namespace boost {
      template <result_type n>
      struct choose_initial_n {
 
-         BOOST_STATIC_CONSTANT(bool, c = (argument_type(1) << n << n) != 0);
+         enum { c = (argument_type(1) << n << n) != 0 };
          BOOST_STATIC_CONSTANT(
              result_type,
              value = !c*n + choose_initial_n<2*c*n>::value
@@ -85,7 +85,7 @@ namespace boost {
      template <argument_type x, result_type n = initial_n>
      struct static_log2_impl {
 
-         BOOST_STATIC_CONSTANT(bool, c = (x >> n) > 0); // x >= 2**n ?
+         enum { c = (x >> n) > 0 }; // x >= 2**n ?
          BOOST_STATIC_CONSTANT(
              result_type,
              value = c*n + (static_log2_impl< (x>>c*n), n/2 >::value)

index.html

@@ -10,8 +10,8 @@
 		<td bgcolor="white"><img src="../../boost.png" alt="boost.png (6897 bytes)" width="277" height="86"></td>
 		<td><a href="../../index.htm"><font face="Arial" color="white"><big>Home</big></font></a></td>
 		<td><a href="../libraries.htm"><font face="Arial" color="white"><big>Libraries</big></font></a></td>
-		<td><a href="http://www.boost.org/people/people.htm"><font face="Arial" color="white"><big>People</big></font></a></td>
-		<td><a href="http://www.boost.org/more/faq.htm"><font face="Arial" color="white"><big>FAQ</big></font></a></td>
+		<td><a href="../../people/people.htm"><font face="Arial" color="white"><big>People</big></font></a></td>
+		<td><a href="../../more/faq.htm"><font face="Arial" color="white"><big>FAQ</big></font></a></td>
 		<td><a href="../../more/index.htm"><font face="Arial" color="white"><big>More</big></font></a></td>
 	</tr>
 </table>

integer.htm

@@ -193,11 +193,11 @@ href="../../boost/cstdint.hpp">&lt;boost/cstdint.hpp&gt;</a></cite>.</p>
 <h2><a name="credits">Credits</a></h2>
 
 <p>The author of most of the Boost integer type choosing templates is <a
-href="http://www.boost.org/people/beman_dawes.html">Beman Dawes</a>.  He gives thanks
+href="../../people/beman_dawes.html">Beman Dawes</a>.  He gives thanks
 to Valentin Bonnard and
-<a href="http://www.boost.org/people/kevlin_henney.htm"> Kevlin Henney</a> for sharing
+<a href="../../people/kevlin_henney.htm"> Kevlin Henney</a> for sharing
 their designs for similar templates.  <a
-href="http://www.boost.org/people/daryle_walker.html">Daryle Walker</a> designed the
+href="../../people/daryle_walker.html">Daryle Walker</a> designed the
 value-based sized templates.</p>
 
 <hr>
@@ -206,7 +206,7 @@ value-based sized templates.</p>
 
 <p>&copy; Copyright Beman Dawes 1999.  Use, modification, and distribution are
 subject to the Boost Software License, Version 1.0.  (See accompanying file <a
-href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or a copy at &lt;<a
+href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or a copy at &lt;<a
 href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>&gt;.)</p>
 </body>
-</html>
+</html>

test/Jamfile.v2

@@ -1,20 +0,0 @@
-#~ Copyright Rene Rivera 2008
-#~ Distributed under the Boost Software License, Version 1.0.
-#~ (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
-import testing ;
-
-test-suite integer
-    :   [ run cstdint_test.cpp ]
-        [ run integer_test.cpp
-            /boost/test//boost_unit_test_framework ]
-        [ run integer_traits_test.cpp
-            /boost/test//boost_test_exec_monitor/<link>static ]
-        [ run integer_mask_test.cpp
-            /boost/test//boost_unit_test_framework ]
-        [ run static_log2_test.cpp
-            /boost/test//boost_test_exec_monitor/<link>static ]
-        [ run static_min_max_test.cpp
-            /boost/test//boost_test_exec_monitor/<link>static ]
-#        [ compile issue_2134.cpp ]
-    ;

test/integer_mask_test.cpp

@@ -10,7 +10,8 @@
 //  Revision History
 //  23 Sep 2001  Initial version (Daryle Walker)
 
-#include <boost/test/minimal.hpp>  // for main
+#define  BOOST_INCLUDE_MAIN
+#include <boost/test/test_tools.hpp>  // for main
 
 #include <boost/cstdlib.hpp>               // for boost::exit_success
 #include <boost/integer/integer_mask.hpp>  // for boost::high_bit_mask_t, etc.