This commit was manufactured by cvs2svn to create tag

'Version_1_20_0'.

[SVN r8518]

cstdint.htm

@@ -12,11 +12,10 @@
 <h1><img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)" align="center" width="277" height="86">Header
 boost/cstdint.hpp&nbsp;</h1>
 <p>The header <code><a href="../../boost/cstdint.hpp">&lt;boost/cstdint.hpp&gt;</a></code>
-places the contents of the header <code><a href="../../boost/stdint.h">&lt;boost/stdint.h&gt;</a></code>
-in namespace boost.&nbsp; That header consists entirely of typedef's useful for
-writing portable code that requires certain integer widths.</p>
+provides the typedef's useful for
+writing portable code that requires certain integer widths.  All typedef's are in namespace boost.</p>
 <p>The specifications are based on the ISO/IEC 9899:1999 C Language standard
-header stdint.h.&nbsp; The 64-bit types required by the C standard are not
+header &lt;stdint.h&gt;.&nbsp; The 64-bit types required by the C standard are not
 required in the boost header, and may not be supplied in all implementations,
 because <code>long long</code> is not [yet] included in the C++ standard.</p>
 <p>See <a href="cstdint_test.cpp">cstdint_test.cpp</a> for a test program.</p>
@@ -70,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 -->29 Jun 2000<!--webbot bot="Timestamp" endspan i-checksum="15060" -->
+<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>
 <p>&nbsp;</p>
 

cstdint_test.cpp

@@ -9,7 +9,8 @@
 //  See http://www.boost.org for most recent version including documentation.
 
 //  Revision History
-//   23 Sept 00 Added INTXX_C constant macro support + int64_t support (John Maddock).
+//   12 Nov 00  Adapted to merged <boost/cstdint.hpp>
+//   23 Sep 00  Added INTXX_C constant macro support + int64_t support (John Maddock).
 //   28 Jun 00  Initial version
 #include <cassert>
 #include <iostream>
@@ -86,7 +87,7 @@ void integral_constant_checker::check()
   assert( uint_least32 == 4294967295u );
   assert( uint_fast32 == 4294967295u );
 }
-#endif
+#endif // BOOST_NO_INCLASS_MEMBER_INITIALIZATION
 
 //
 // the following function simply verifies that the type
@@ -111,8 +112,10 @@ void integral_constant_type_check(T1, T2)
    T1 t1 = -1;
    T2 t2 = -1;
    assert(t1 == t2);
-   if(t1 >= 0)assert(t2 >= 0);
-   else assert(t2 < 0);
+   if(t1 >= 0)
+     assert(t2 >= 0);
+   else
+     assert(t2 < 0);
 }
 
 
@@ -124,15 +127,15 @@ int main()
   //
   // verify the types of the integral constants:
   //
-  integral_constant_type_check(int8_t(0), INT8_C(0));
-  integral_constant_type_check(uint8_t(0), UINT8_C(0));
-  integral_constant_type_check(int16_t(0), INT16_C(0));
-  integral_constant_type_check(uint16_t(0), UINT16_C(0));
-  integral_constant_type_check(int32_t(0), INT32_C(0));
-  integral_constant_type_check(uint32_t(0), UINT32_C(0));
+  integral_constant_type_check(boost::int8_t(0), INT8_C(0));
+  integral_constant_type_check(boost::uint8_t(0), UINT8_C(0));
+  integral_constant_type_check(boost::int16_t(0), INT16_C(0));
+  integral_constant_type_check(boost::uint16_t(0), UINT16_C(0));
+  integral_constant_type_check(boost::int32_t(0), INT32_C(0));
+  integral_constant_type_check(boost::uint32_t(0), UINT32_C(0));
 #ifndef BOOST_NO_INT64_T
-  integral_constant_type_check(int64_t(0), INT64_C(0));
-  integral_constant_type_check(uint64_t(0), UINT64_C(0));
+  integral_constant_type_check(boost::int64_t(0), INT64_C(0));
+  integral_constant_type_check(boost::uint64_t(0), UINT64_C(0));
 #endif
   //
   boost::int8_t          int8          = INT8_C(-127);
@@ -220,5 +223,5 @@ int main()
 #include <boost/cstdint.hpp>
 
 #ifdef INT8_C
-#error stdint.h not correctly defined
+#error boost/cstdint.hpp not correctly defined
 #endif

include/boost/cstdint.hpp

@@ -1,4 +1,4 @@
-//  boost cstdint.hpp header file  -------------------------------------------//
+//  boost cstdint.hpp header file  ------------------------------------------//
 
 //  (C) Copyright boost.org 1999. Permission to copy, use, modify, sell
 //  and distribute this software is granted provided this copyright
@@ -9,21 +9,23 @@
 //  See http://www.boost.org for most recent version including documentation.
 
 //  Revision History
+//   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)
 //   29 Jun 00  Reimplement to avoid including stdint.h within namespace boost
 //    8 Aug 99  Initial version (Beman Dawes)
 
-//
-// this has to go before the include guard (JM):
-#include <boost/stdint.h>
 
 #ifndef BOOST_CSTDINT_HPP
 #define BOOST_CSTDINT_HPP
 
-#include <limits.h> // implementation artifact; not part of interface
+#include <boost/config.hpp>
 
 
+#ifdef BOOST_SYSTEM_HAS_STDINT_H
+
+# include <stdint.h> // implementation artifact; not part of interface
+
 namespace boost
 {
 
@@ -48,7 +50,7 @@ namespace boost
   using ::uint_least32_t;     
   using ::uint_fast32_t;      
                      
-#ifndef BOOST_NO_INT64_T
+# ifndef BOOST_NO_INT64_T
 
   using ::int64_t;            
   using ::int_least64_t;      
@@ -57,12 +59,241 @@ namespace boost
   using ::uint_least64_t;     
   using ::uint_fast64_t;      
                      
-#endif
+# endif
 
   using ::intmax_t;      
   using ::uintmax_t;     
 
 } // namespace boost
 
-#endif
 
+#else  // BOOST_SYSTEM_HAS_STDINT_H
+
+
+# include <limits.h> // implementation artifact; not part of interface
+
+
+namespace boost
+{
+
+//  These are fairly safe guesses for some 16-bit, and most 32-bit and 64-bit
+//  platforms.  For other systems, they will have to be hand tailored.
+//
+//  Because the fast types are assumed to be the same as the undecorated types,
+//  it may be possible to hand tailor a more efficient implementation.  Such
+//  an optimization may be illusionary; on the Intel x86-family 386 on, for
+//  example, byte arithmetic and load/stores are as fast as "int" sized ones.
+
+//  8-bit types  ------------------------------------------------------------//
+
+# if UCHAR_MAX == 0xff
+     typedef signed char     int8_t;
+     typedef signed char     int_least8_t;
+     typedef signed char     int_fast8_t;
+     typedef unsigned char   uint8_t;
+     typedef unsigned char   uint_least8_t;
+     typedef unsigned char   uint_fast8_t;
+# else
+#    error defaults not correct; you must hand modify boost/cstdint.hpp
+# endif
+
+//  16-bit types  -----------------------------------------------------------//
+
+# if USHRT_MAX == 0xffff
+     typedef short           int16_t;
+     typedef short           int_least16_t;
+     typedef short           int_fast16_t;
+     typedef unsigned short  uint16_t;
+     typedef unsigned short  uint_least16_t;
+     typedef unsigned short  uint_fast16_t;
+# else
+#    error defaults not correct; you must hand modify boost/cstdint.hpp
+# endif
+
+//  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
+     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;
+# 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)
+                                                                 // 2**64 - 1
+     typedef long long            intmax_t;
+     typedef unsigned long long   uintmax_t;
+     typedef long long            int64_t;
+     typedef long long            int_least64_t;
+     typedef long long            int_fast64_t;
+     typedef unsigned long long   uint64_t;
+     typedef unsigned long long   uint_least64_t;
+     typedef unsigned long long   uint_fast64_t;
+#    else
+#       error defaults not correct; you must hand modify boost/cstdint.hpp
+#    endif
+# elif ULONG_MAX != 0xffffffff
+
+#    if ULONG_MAX == 18446744073709551615 // 2**64 - 1
+     typedef long                 intmax_t;
+     typedef unsigned long        uintmax_t;
+     typedef long                 int64_t;
+     typedef long                 int_least64_t;
+     typedef long                 int_fast64_t;
+     typedef unsigned long        uint64_t;
+     typedef unsigned long        uint_least64_t;
+     typedef unsigned long        uint_fast64_t;
+#    else
+#       error defaults not correct; you must hand modify boost/cstdint.hpp
+#    endif
+# elif (defined(BOOST_MSVC) && (BOOST_MSVC >= 1100)) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x520))
+     //
+     // we have Borland/Microsoft __int64:
+     //
+     typedef __int64             intmax_t;
+     typedef unsigned __int64    uintmax_t;
+     typedef __int64             int64_t;
+     typedef __int64             int_least64_t;
+     typedef __int64             int_fast64_t;
+     typedef unsigned __int64    uint64_t;
+     typedef unsigned __int64    uint_least64_t;
+     typedef unsigned __int64    uint_fast64_t;
+# else // assume no 64-bit integers
+#  define BOOST_NO_INT64_T
+     typedef int32_t              intmax_t;
+     typedef uint32_t             uintmax_t;
+# endif
+
+} // namespace boost
+
+
+#endif // BOOST_SYSTEM_HAS_STDINT_H
+
+#endif // BOOST_CSTDINT_HPP
+
+
+/****************************************************
+
+Macro definition section:
+
+Define various INTXX_C macros only if
+__STDC_CONSTANT_MACROS is defined.
+
+Undefine the macros if __STDC_CONSTANT_MACROS is
+not defined and the macros are (cf <cassert>).
+
+Added 23rd September (John Maddock).
+
+******************************************************/
+
+#if defined(__STDC_CONSTANT_MACROS) && !defined(BOOST__STDC_CONSTANT_MACROS_DEFINED)
+# define BOOST__STDC_CONSTANT_MACROS_DEFINED
+# if (defined(BOOST_MSVC) && (BOOST_MSVC >= 1100)) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x520))
+//
+// Borland/Microsoft compilers have width specific suffixes:
+//
+#  define INT8_C(value)     value##i8
+#  define INT16_C(value)    value##i16
+#  define INT32_C(value)    value##i32
+#  define INT64_C(value)    value##i64
+#  ifdef __BORLANDC__
+    // Borland bug: appending ui8 makes the type a signed char
+#   define UINT8_C(value)    static_cast<unsigned char>(value##u)
+#  else
+#   define UINT8_C(value)    value##ui8
+#  endif
+#  define UINT16_C(value)   value##ui16
+#  define UINT32_C(value)   value##ui32
+#  define UINT64_C(value)   value##ui64
+#  define INTMAX_C(value)   value##i64
+#  define UINTMAX_C(value)  value##ui64
+
+# else
+//  do it the old fashioned way:
+
+//  8-bit types  ------------------------------------------------------------//
+
+#  if UCHAR_MAX == 0xff
+#   define INT8_C(value) static_cast<boost::int8_t>(value)
+#   define UINT8_C(value) static_cast<boost::uint8_t>(value##u)
+#  endif
+
+//  16-bit types  -----------------------------------------------------------//
+
+#  if USHRT_MAX == 0xffff
+#   define INT16_C(value) static_cast<boost::int16_t>(value)
+#   define UINT16_C(value) static_cast<boost::uint16_t>(value##u)
+#  endif
+
+//  32-bit types  -----------------------------------------------------------//
+
+#  if UINT_MAX == 0xffffffff
+#   define INT32_C(value) value
+#   define UINT32_C(value) value##u
+#  elif ULONG_MAX == 0xffffffff
+#   define INT32_C(value) value##L
+#   define UINT32_C(value) value##uL
+#  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)
+#       define INT64_C(value) value##LL
+#       define UINT64_C(value) value##uLL
+#    else
+#       error defaults not correct; you must hand modify boost/cstdint.hpp
+#    endif
+#  elif ULONG_MAX != 0xffffffff
+
+#    if ULONG_MAX == 18446744073709551615 // 2**64 - 1
+#       define INT64_C(value) value##L
+#       define UINT64_C(value) value##uL
+#    else
+#       error defaults not correct; you must hand modify boost/cstdint.hpp
+#    endif
+#  endif
+
+#  ifdef BOOST_NO_INT64_T
+#   define INTMAX_C(value) INT32_C(value)
+#   define UINTMAX_C(value) UINT32_C(value)
+#  else
+#   define INTMAX_C(value) INT64_C(value)
+#   define UINTMAX_C(value) UINT64_C(value)
+#  endif
+
+# endif // Borland/Microsoft specific width suffixes
+
+
+#elif defined(BOOST__STDC_CONSTANT_MACROS_DEFINED) && !defined(__STDC_CONSTANT_MACROS)
+//
+// undef all the macros:
+//
+# undef INT8_C
+# undef INT16_C
+# undef INT32_C
+# undef INT64_C
+# undef UINT8_C
+# undef UINT16_C
+# undef UINT32_C
+# undef UINT64_C
+# undef INTMAX_C
+# undef UINTMAX_C
+
+#endif // __STDC_CONSTANT_MACROS_DEFINED etc.

include/boost/stdint.h

@@ -1,4 +1,4 @@
-//  boost stdint.h header file  ----------------------------------------------//
+//  boost stdint.h header file  ---------------------------------------------//
 
 //  (C) Copyright boost.org 1999. Permission to copy, use, modify, sell
 //  and distribute this software is granted provided this copyright
@@ -12,7 +12,25 @@
 //  header.  C++ programs are advised to use <boost/cstdint.hpp> rather than
 //  this header.
 
+//  NOTE OF OBSOLESCENCE: In general, this header file cannot detect
+//  whether the current translation unit somewhere includes ISO C99
+//  <stdint.h> or not.  For example, in case BOOST_SYSTEM_HAS_STDINT_H
+//  is not defined and ISO C99 <stdint.h> has been included before,
+//  this file will re-define ISO C99 reserved file-scope identifiers
+//  such as int8_t (see ISO C99 7.1.3 and 7.18).  Defining the macro
+//  BOOST_SYSTEM_HAS_STDINT_H is not sufficient in general, in
+//  particular if a partly conformant <stdint.h> header is available
+//  on the platform, e.g. Comeau C++ with GNU glibc 2.1.2.
+//
+//  In order to avoid incompatibilities with ISO C99, this header
+//  should not be used at all, and it may be deleted in the future.
+//  C++ programs which require ISO C99 <stdint.h> functionality are
+//  strongly advised to use <boost/cstdint.hpp> instead, which
+//  provides <stdint.h> names in namespace boost, e.g. boost::int8_t.
+
+
 //  Revision History
+//   12 Nov 00  obsoleted (Jens Maurer)
 //   23 Sep 00  INTXX_C support added (John Maddock)
 //   22 Sep 00  64-bit support for Borland & Microsoft compilers (John Maddock)
 //    8 Aug 99  Initial version (Beman Dawes)

index.htm

@@ -14,8 +14,8 @@
   <tr>
     <td bgcolor="#FFFFFF"><img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)" width="277" height="86"></td>
     <td><a href="../../index.htm"><font face="Arial" color="#FFFFFF"><big>Home </big></font></a></td>
-    <td><a href="../../libraries.htm"><font face="Arial" color="#FFFFFF"><big>Libraries </big></font></a></td>
-    <td><a href="../../people.htm"><font face="Arial" color="#FFFFFF"><big>People </big></font></a></td>
+    <td><a href="../libraries.htm"><font face="Arial" color="#FFFFFF"><big>Libraries </big></font></a></td>
+    <td><a href="../../people/people.htm"><font face="Arial" color="#FFFFFF"><big>People </big></font></a></td>
     <td><a href="../../more/faq.htm"><font face="Arial" color="#FFFFFF"><big>FAQ </big></font></a></td>
     <td><a href="../../more/index.htm"><font face="Arial" color="#FFFFFF"><big>More </big></font></a></td>
   </tr>
@@ -34,19 +34,12 @@
       </a></code><a href="cstdint.htm"><br>
       documentation</a>
     </td>
-    <td valign="top">Contents of <code>&lt;boost/stdint.h&gt;</code> wrapped in namespace boost.</td>
+    <td valign="top">Typedef's based on the 1999 C Standard header &lt;<code>stdint.h&gt;</code>, wrapped in namespace boost.
+      This implementation may #include the compiler
+      supplied &lt;<code>stdint.h&gt;</code>, if present.  </td>
     <td valign="top">Supplies typedefs for standard integer types such as <code> int32_t</code> or <code>uint_least16_t</code>.
-      Use in preference to &lt;<code>stdint.h&gt;</code> or<code> &lt;boost/stdint.h&gt;</code>
-      because the names are safely placed in the boost namespace.</td>
-  </tr>
-  <tr>
-    <td align="center"><code><a href="../../boost/stdint.h">&lt;boost/stdint.h&gt;</a></code></td>
-    <td valign="top">Typedefs as defined in the C99 standard header &lt;<code>stdint.h&gt;</code>.
-      This implementation #includes the compiler
-      supplied &lt;<code>stdint.h&gt;</code>, if present.</td>
-    <td valign="top"> Supplied
-      for use in the implementation of &lt;boost/cstdint.hpp&gt; and to ease transition to the C99 standard.
-      Other uses are not recommended because this header places its names in the global namespace.&nbsp;</td>
+      Use in preference to &lt;<code>stdint.h&gt;</code>
+      for enhanced portability.  Furthermore, all names are safely placed in the boost namespace.</td>
   </tr>
   <tr>
     <td align="center"><code><a href="../../boost/integer_traits.hpp">&lt;boost/integer_traits.hpp&gt;</a></code><br>
@@ -70,17 +63,16 @@
 
 <h2>Rationale</h2>
 <p>The organization of boost integer headers and classes is designed to take
-advantage of <code>&lt;stdint.h&gt;</code> types from in the 1999 C standard
+advantage of <code>&lt;stdint.h&gt;</code> types from the 1999 C standard
 without resorting to undefined behavior in terms of
 the 1998 C++ standard.&nbsp; The header <code>&lt;boost/cstdint.hpp&gt;</code>
-makes the standard integer types safely available in namespace boost without placing any names in the
-global namespace or namespace std. As always, the intension is to complement rather than
+makes the standard integer types safely available in namespace boost without placing any names in namespace std. As always, the intension is to complement rather than
 compete with the C++ Standard Library.&nbsp; Should some future C++ standard
-include <code>&lt;stdint.h&gt;</code> and <code>&lt;cstdint&gt;</code>, then <code>&lt;boost/stdint.h&gt;</code> and <code>&lt;boost/cstdint.hpp&gt;</code>
+include <code>&lt;stdint.h&gt;</code> and <code>&lt;cstdint&gt;</code>, then <code>&lt;boost/cstdint.hpp&gt;</code>
 will continue to function, but will become redundant and may be safely deprecated.</p>
 <p>Because these are boost headers, their names conform to boost header naming
-conventions rather than C++ Standard Library header naming conventions.&nbsp; An
-exception is <code>&lt;boost/stdint.h&gt; </code>which uses a <b> .h</b> extension to indicate its C rather than C++ heritage.</p>
+conventions rather than C++ Standard Library header naming conventions.
+
 <h2>Caveat emptor</h2>
 <p>As an
       implementation artifact, certain C &lt;limits.h&gt; macro names may possibly be
@@ -88,9 +80,17 @@ visible to users of &lt;boost/cstdint.hpp&gt;.&nbsp; Don't use these macros; the
 any Boost specified interface.&nbsp;
       Use boost:: integer_traits&lt;&gt; or std::numeric_limits&lt;&gt; instead.</p>
 
+<p>
+As another implementation artifact, certain C
+<code>&lt;stdint.h&gt;</code> typedef names may possibly be visible in the
+global namespace to users of <code>&lt;boost/cstdint.hpp&gt;</code>.
+Don't use these names, they are not part of any Boost specified
+interface.  Use the respective names in namespace <code>boost</code>
+instead.
+
 <hr>
 
-<p>Revised: <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %b %Y" startspan -->05 Mar 2000<!--webbot bot="Timestamp" endspan i-checksum="14882" -->
+<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>
 
 </body>