This commit was manufactured by cvs2svn to create tag

'Version_1_21_2'.

[SVN r9983]

include/boost/cstdint.hpp

@@ -26,17 +26,7 @@
 
 #ifdef BOOST_SYSTEM_HAS_STDINT_H
 
-// The following #include is an implementation artifact; not part of interface.
-# ifdef __hpux
-// HP-UX has a nice <stdint.h> in a non-standard location
-#   include <sys/_inttypes.h>
-#   ifdef __STDC_32_MODE__
-      // this is triggered with GCC, because it defines __cplusplus < 199707L
-#     define BOOST_NO_INT64_T
-#   endif 
-# else
-#   include <stdint.h>
-# endif
+# include <stdint.h> // implementation artifact; not part of interface
 
 namespace boost
 {
@@ -144,9 +134,7 @@ namespace boost
 
 //  64-bit types + intmax_t and uintmax_t  ----------------------------------//
 
-# if !defined(BOOST_MSVC) && !defined(__BORLANDC__) && \
-   (!defined(__GLIBCPP__) || defined(_GLIBCPP_USE_LONG_LONG)) && \
-   (defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || defined(ULONGLONG_MAX))
+# if defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || defined(ULONGLONG_MAX)
 #    if (defined(ULLONG_MAX) && ULLONG_MAX == 18446744073709551615U) || (defined(ULONG_LONG_MAX) && ULONG_LONG_MAX == 18446744073709551615U) || (defined(ULONGLONG_MAX) && ULONGLONG_MAX == 18446744073709551615U)
                                                                  // 2**64 - 1
      typedef long long            intmax_t;
@@ -266,10 +254,8 @@ Added 23rd September (John Maddock).
 //  64-bit types + intmax_t and uintmax_t  ----------------------------------//
 
 #  if defined(ULLONG_MAX) || defined(ULONG_LONG_MAX) || defined(ULONGLONG_MAX)
-     // HP-UX's value of ULONG_LONG_MAX is unusable in preprocessor expressions
 #    if (defined(ULLONG_MAX) && ULLONG_MAX == 18446744073709551615U) ||  \
-        (defined(ULONG_LONG_MAX) && (defined(__hpux) || ULONG_LONG_MAX == 18446744073709551615U)) ||  \
-        (defined(ULONGLONG_MAX) && ULONGLONG_MAX == 18446744073709551615U)
+        (defined(ULONG_LONG_MAX) && ULONG_LONG_MAX == 18446744073709551615U) || (defined(ULONGLONG_MAX) && ULONGLONG_MAX == 18446744073709551615U)
 #       define INT64_C(value) value##LL
 #       define UINT64_C(value) value##uLL
 #    else
@@ -313,4 +299,3 @@ Added 23rd September (John Maddock).
 
 #endif // __STDC_CONSTANT_MACROS_DEFINED etc.
 
-

include/boost/integer_traits.hpp

@@ -21,11 +21,8 @@
 #include <boost/config.hpp>
 #include <boost/limits.hpp>
 
-// These are an implementation detail and not part of the interface
+// This is an implementation detail and not part of the interface
 #include <limits.h>
-#ifndef BOOST_NO_INTRINSIC_WCHAR_T
-#include <wchar.h>
-#endif
 
 
 namespace boost {
@@ -33,7 +30,11 @@ template<class T>
 class integer_traits : public std::numeric_limits<T>
 {
 public:
-  BOOST_STATIC_CONSTANT(bool, is_integral = false);
+#ifndef BOOST_NO_INCLASS_MEMBER_INITIALIZATION
+  static const bool is_integral = false;
+#else
+  enum { is_integral = false };
+#endif
 };
 
 namespace detail {
@@ -41,20 +42,18 @@ template<class T, T min_val, T max_val>
 class integer_traits_base
 {
 public:
-  BOOST_STATIC_CONSTANT(bool, is_integral = true);
-  BOOST_STATIC_CONSTANT(T, const_min = min_val);
-  BOOST_STATIC_CONSTANT(T, const_max = max_val);
-};
-
 #ifndef BOOST_NO_INCLASS_MEMBER_INITIALIZATION
-//  The definition is required even for integral static constants
-template<class T, T min_val, T max_val>
-const T integer_traits_base<T, min_val, max_val>::const_min;
-
-template<class T, T min_val, T max_val>
-const T integer_traits_base<T, min_val, max_val>::const_max;
+  static const bool is_integral = true;
+  static const T const_min = min_val;
+  static const T const_max = max_val;
+#else
+  enum {
+    is_integral = true,
+    const_min = min_val,
+    const_max = max_val
+  };
 #endif
-
+};
 } // namespace detail
 
 template<>
@@ -81,25 +80,7 @@ class integer_traits<unsigned char>
     public detail::integer_traits_base<unsigned char, 0, UCHAR_MAX>
 { };
 
-#ifndef BOOST_NO_INTRINSIC_WCHAR_T
-template<>
-class integer_traits<wchar_t>
-  : public std::numeric_limits<wchar_t>,
-#if defined(__BORLANDC__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__BEOS__) && defined(__GNUC__))
-    // No WCHAR_MIN and WCHAR_MAX, whar_t is short and unsigned:
-    public detail::integer_traits_base<wchar_t, 0, 0xffff>
-#elif defined(__sgi) && (!defined(__SGI_STL_PORT) || __SGI_STL_PORT < 0x400)
-    // SGI MIPSpro with native library doesn't have them, either
-    public detail::integer_traits_base<wchar_t, INT_MIN, INT_MAX>
-#elif defined(__hpux) && defined(__GNUC__) && !defined(__SGI_STL_PORT)
-    // GCC 2.95.2 doesn't have them on HP-UX, either
-    // (also, std::numeric_limits<wchar_t> appears to return the wrong values)
-    public detail::integer_traits_base<wchar_t, 0, UINT_MAX>
-#else
-    public detail::integer_traits_base<wchar_t, WCHAR_MIN, WCHAR_MAX>
-#endif
-{ };
-#endif // BOOST_NO_INTRINSIC_WCHAR_T
+// What about wchar_t ?
 
 template<>
 class integer_traits<short>
@@ -159,7 +140,7 @@ class integer_traits<unsigned long long>
   : public std::numeric_limits<unsigned long long>,
     public detail::integer_traits_base<unsigned long long, 0, ULONG_LONG_MAX>
 { };
-#elif defined(ULONGLONG_MAX) && !defined(BOOST_MSVC) && !defined(__BORLANDC__)
+#elif defined(ULONGLONG_MAX)
 template<>
 class integer_traits<long long>
   : public std::numeric_limits<long long>,
@@ -175,4 +156,3 @@ class integer_traits<unsigned long long>
 } // namespace boost
 
 #endif /* BOOST_INTEGER_TRAITS_HPP */
-

integer_traits_test.cpp

@@ -2,7 +2,7 @@
  *
  * Copyright Jens Maurer 2000
  * Permission to use, copy, modify, sell, and distribute this software
- * is hereby granted without fee provided that the above copyright notice
+ * is hereby granted without free provided that the above copyright notice
  * appears in all copies and that both that copyright notice and this
  * permission notice appear in supporting documentation,
  *
@@ -18,12 +18,15 @@
  */
 
 #include <iostream>
+#include <cassert>
 #include <boost/integer_traits.hpp>
 // use int64_t instead of long long for better portability
 #include <boost/cstdint.hpp>
 
-#define BOOST_INCLUDE_MAIN
-#include <boost/test/test_tools.hpp>
+#ifdef NDEBUG
+#error This test relies on assert() and thus makes no sense with NDEBUG defined
+#endif
+
 
 /*
  * General portability note:
@@ -43,14 +46,14 @@ void runtest(const char * type, T)
 	    << "; min is " << traits::min()
             << ", max is " << traits::max()
 	    << std::endl;
-  BOOST_TEST(traits::is_specialized);
-  BOOST_TEST(traits::is_integer);
-  BOOST_TEST(traits::is_integral);
-  BOOST_TEST(traits::const_min == traits::min());
-  BOOST_TEST(traits::const_max == traits::max());
+  assert(traits::is_specialized);
+  assert(traits::is_integer);
+  assert(traits::is_integral);
+  assert(traits::const_min == traits::min());
+  assert(traits::const_max == traits::max());
 }
 
-int test_main(int, char*[])
+int main()
 {
   runtest("bool", bool());
   runtest("char", char());
@@ -58,7 +61,6 @@ int test_main(int, char*[])
   runtest("signed char", signed_char());
   typedef unsigned char unsigned_char;
   runtest("unsigned char", unsigned_char());
-  runtest("wchar_t", wchar_t());
   runtest("short", short());
   typedef unsigned short unsigned_short;
   runtest("unsigned short", unsigned_short());
@@ -74,8 +76,6 @@ int test_main(int, char*[])
   // 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());
-#else
-  std::cout << "Skipped int64_t and uint64_t" << std::endl;
 #endif
   // Some compilers don't pay attention to std:3.6.1/5 and issue a
   // warning here if "return 0;" is omitted.