This commit was manufactured by cvs2svn to create tag

'Version_1_21_1'.

[SVN r9561]

cstdint.htm

@@ -69,7 +69,7 @@ representing any value of any signed integer type.</p>
 capable of representing any value of any unsigned integer type.</p>
 <p>These types are required.</p>
 <hr>
-<p>Revised <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %b %Y" startspan -->14 Nov 2000<!--webbot bot="Timestamp" endspan i-checksum="15241" -->
+<p>Revised <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %b %Y" startspan -->18 Nov 2000<!--webbot bot="Timestamp" endspan i-checksum="15249" -->
 </p>
 <p>&nbsp;</p>
 

include/boost/cstdint.hpp

@@ -9,6 +9,7 @@
 //  See http://www.boost.org for most recent version including documentation.
 
 //  Revision History
+//   23 Jan 01  prefer "long" over "int" for int32_t and intmax_t (Jens Maurer)
 //   12 Nov 00  Merged <boost/stdint.h> (Jens Maurer)
 //   23 Sep 00  Added INTXX_C macro support (John Maddock).
 //   22 Sep 00  Better 64-bit support (John Maddock)
@@ -112,29 +113,28 @@ namespace boost
 
 //  32-bit types  -----------------------------------------------------------//
 
-# if UINT_MAX == 0xffffffff
-     typedef int             int32_t;
-     typedef int             int_least32_t;
-     typedef int             int_fast32_t;
-     typedef unsigned int    uint32_t;
-     typedef unsigned int    uint_least32_t;
-     typedef unsigned int    uint_fast32_t;
-# elif ULONG_MAX == 0xffffffff
+# if ULONG_MAX == 0xffffffff
      typedef long            int32_t;
      typedef long            int_least32_t;
      typedef long            int_fast32_t;
      typedef unsigned long   uint32_t;
      typedef unsigned long   uint_least32_t;
      typedef unsigned long   uint_fast32_t;
+# elif UINT_MAX == 0xffffffff
+     typedef int             int32_t;
+     typedef int             int_least32_t;
+     typedef int             int_fast32_t;
+     typedef unsigned int    uint32_t;
+     typedef unsigned int    uint_least32_t;
+     typedef unsigned int    uint_fast32_t;
 # else
 #    error defaults not correct; you must hand modify boost/cstdint.hpp
 # endif
 
 //  64-bit types + intmax_t and uintmax_t  ----------------------------------//
 
-# if (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX)) && !(defined(_WIN32) && defined(__GNUC__))
-#    if(defined(ULLONG_MAX) && ULLONG_MAX == 18446744073709551615) ||  \
-        (defined(ULONG_LONG_MAX) && ULONG_LONG_MAX == 18446744073709551615)
+# if (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX))
+#    if(defined(ULLONG_MAX) && ULLONG_MAX == 18446744073709551615U) || (defined(ULONG_LONG_MAX) && ULONG_LONG_MAX == 18446744073709551615U)
                                                                  // 2**64 - 1
      typedef long long            intmax_t;
      typedef unsigned long long   uintmax_t;
@@ -252,7 +252,7 @@ Added 23rd September (John Maddock).
 
 //  64-bit types + intmax_t and uintmax_t  ----------------------------------//
 
-#  if (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX)) && !(defined(_WIN32) && defined(__GNUC__))
+#  if (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX))
 #    if(defined(ULLONG_MAX) && ULLONG_MAX == 18446744073709551615) ||  \
         (defined(ULONG_LONG_MAX) && ULONG_LONG_MAX == 18446744073709551615)
 #       define INT64_C(value) value##LL
@@ -297,3 +297,4 @@ Added 23rd September (John Maddock).
 # undef UINTMAX_C
 
 #endif // __STDC_CONSTANT_MACROS_DEFINED etc.
+

include/boost/integer.hpp

@@ -23,6 +23,7 @@ namespace boost
   //  Helper templates  ------------------------------------------------------//
 
   //  fast integers from least integers
+  //  int_fast_t<> works correctly for unsigned too, in spite of the name.
   template< typename LeastInt >
   struct int_fast_t { typedef LeastInt fast; }; // imps may specialize
 
@@ -31,6 +32,7 @@ namespace boost
 
   //  specializatons: 1=long, 2=int, 3=short, 4=signed char,
   //     6=unsigned long, 7=unsigned int, 8=unsigned short, 9=unsigned long
+  //  no specializations for 0 and 5: requests for a type > long are in error
   template<> struct int_least_helper<1> { typedef long least; };
   template<> struct int_least_helper<2> { typedef int least; };
   template<> struct int_least_helper<3> { typedef short least; };
@@ -53,7 +55,7 @@ namespace boost
           (Bits-1 <= std::numeric_limits<short>::digits) +
           (Bits-1 <= std::numeric_limits<signed char>::digits)
         >::least  least;
-      typedef int_fast_t<least>::fast  fast;
+      typedef typename int_fast_t<least>::fast  fast;
   };
 
   //  unsigned
@@ -68,7 +70,8 @@ namespace boost
           (Bits <= std::numeric_limits<unsigned short>::digits) +
           (Bits <= std::numeric_limits<unsigned char>::digits)
         >::least  least;
-      typedef int_fast_t<least>::fast  fast;
+      typedef typename int_fast_t<least>::fast  fast;
+      // int_fast_t<> works correctly for unsigned too, in spite of the name.
   };
 
 //  The same dispatching technique can be used to select types based on

include/boost/integer_traits.hpp

@@ -2,7 +2,7 @@
  *
  * Copyright Jens Maurer 2000
  * Permission to use, copy, modify, sell, and distribute this software
- * is hereby granted without free provided that the above copyright notice
+ * is hereby granted without fee provided that the above copyright notice
  * appears in all copies and that both that copyright notice and this
  * permission notice appear in supporting documentation,
  *

index.htm

@@ -90,7 +90,7 @@ instead.
 
 <hr>
 
-<p>Revised: <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %b %Y" startspan -->14 Nov 2000<!--webbot bot="Timestamp" endspan i-checksum="15241" -->
+<p>Revised: <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %b %Y" startspan -->18 Nov 2000<!--webbot bot="Timestamp" endspan i-checksum="15249" -->
 </p>
 
 </body>

integer.htm

@@ -34,6 +34,7 @@ appropriate to use the types supplied in <code><a href="../../boost/cstdint.hpp"
 <pre>namespace boost
 {
   //  fast integers from least integers
+  // int_fast_t&lt;&gt; works correctly for unsigned too, in spite of the name.
   template&lt; typename LeastInt &gt;  // Required: LeastInt is integral type, not bool
   struct int_fast_t { typedef LeastInt fast; }; // implementations may specialize
 
@@ -51,6 +52,7 @@ appropriate to use the types supplied in <code><a href="../../boost/cstdint.hpp"
   {
       typedef <i>implementation-supplied</i>  least;
       typedef int_fast_t&lt;least&gt;::fast  fast;
+      // int_fast_t&lt;&gt; works correctly for unsigned too, in spite of the name.
   };
 } // namespace boost
 </pre>

integer_test.cpp

@@ -9,15 +9,14 @@
 //  See http://www.boost.org for most recent version including documentation.
 
 //  Revision History
+//   10 Mar 01  Boost Test Library now used for tests (Beman Dawes)
 //   31 Aug 99  Initial version
 
-//  This program is misnamed in that it is really a demonstration rather than
-//  a test.  It doesn't detect failure, so isn't worthy of the name "test".
-
 #include <iostream>
 #include <boost/integer.hpp>
 
-using namespace boost;  // not the best practice, but useful for testing
+#define BOOST_INCLUDE_MAIN
+#include <boost/test/test_tools.hpp>
 
 namespace
 {
@@ -37,8 +36,12 @@ namespace boost
     template<> struct int_fast_t<short> { typedef long fast; };
 }
 
-int main()
+int test_main(int,char**)
 {
+     using boost::int_t;
+     using boost::uint_t;
+
+#ifdef BOOST_SHOW_TYPES
      std::cout << 32 << ' '; test( int_t<32>::least() ); 
      std::cout << 31 << ' '; test( int_t<31>::least() ); 
      std::cout << 30 << ' '; test( int_t<30>::least() ); 
@@ -170,7 +173,145 @@ int main()
      std::cout << 3 << ' '; test( uint_t<3>::fast() ); 
      std::cout << 2 << ' '; test( uint_t<2>::fast() ); 
      std::cout << 1 << ' '; test( uint_t<1>::fast() ); 
-     std::cout << 0 << ' '; test( uint_t<0>::fast() ); 
-
+     std::cout << 0 << ' '; test( uint_t<0>::fast() );
+#endif
+     
+    long v = 0x7FFFFFFF;
+    BOOST_TEST( int_t<32>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<31>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<30>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<29>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<28>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<27>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<26>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<25>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<24>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<23>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<22>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<21>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<20>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<19>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<18>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<17>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<16>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<15>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<14>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<13>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<12>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<11>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<10>::least(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<9>::least(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<8>::least(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<7>::least(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<6>::least(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<5>::least(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<4>::least(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<3>::least(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<2>::least(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<1>::least(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<0>::least(v) == v );
+    v = 0x7FFFFFFF;
+    BOOST_TEST( int_t<32>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<31>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<30>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<29>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<28>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<27>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<26>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<25>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<24>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<23>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<22>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<21>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<20>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<19>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<18>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<17>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<16>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<15>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<14>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<13>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<12>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<11>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<10>::fast(v) == v );    v >>= 1;
+    BOOST_TEST( int_t<9>::fast(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<8>::fast(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<7>::fast(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<6>::fast(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<5>::fast(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<4>::fast(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<3>::fast(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<2>::fast(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<1>::fast(v) == v );     v >>= 1;
+    BOOST_TEST( int_t<0>::fast(v) == v );
+    unsigned long u = 0xFFFFFFFF;
+    BOOST_TEST( uint_t<32>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<31>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<30>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<29>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<28>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<27>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<26>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<25>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<24>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<23>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<22>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<21>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<20>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<19>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<18>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<17>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<16>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<15>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<14>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<13>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<11>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<12>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<10>::least(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<9>::least(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<8>::least(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<7>::least(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<6>::least(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<5>::least(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<4>::least(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<3>::least(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<2>::least(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<1>::least(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<0>::least(u) == u );
+    u = 0xFFFFFFFF;
+    BOOST_TEST( uint_t<32>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<31>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<30>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<29>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<28>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<27>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<26>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<25>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<24>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<23>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<22>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<21>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<20>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<19>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<18>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<17>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<16>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<15>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<14>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<13>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<12>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<11>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<10>::fast(u) == u );    u >>= 1;
+    BOOST_TEST( uint_t<9>::fast(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<8>::fast(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<7>::fast(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<6>::fast(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<5>::fast(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<4>::fast(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<3>::fast(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<2>::fast(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<1>::fast(u) == u );     u >>= 1;
+    BOOST_TEST( uint_t<0>::fast(u) == u );
+        
     return 0;
 }

integer_traits_test.cpp

@@ -70,9 +70,10 @@ int main()
   runtest("long", long());
   typedef unsigned long unsigned_long;
   runtest("unsigned long", unsigned_long());
-#if !defined(BOOST_NO_INT64_T) && !defined(BOOST_MSVC) && !defined(__BORLANDC__)
+#if !defined(BOOST_NO_INT64_T) && !defined(BOOST_MSVC) && !defined(__BORLANDC__) && !defined(__BEOS__)
   //
   // MS/Borland compilers can't support 64-bit member constants
+  // BeOS doesn't have specialisations for long long in SGI's <limits> header.
   runtest("int64_t (possibly long long)", boost::int64_t());
   runtest("uint64_t (possibly unsigned long long)", boost::uint64_t());
 #endif
@@ -80,3 +81,4 @@ int main()
   // warning here if "return 0;" is omitted.
   return 0;
 }
+