This commit was manufactured by cvs2svn to create branch

'function_signature_patches_1_31'. [SVN r22633]
remove minmax hack from win32.hpp and fix all places that could be affected by the minmax macros
2025-07-01 15:01:06 +02:00 · 2004-04-13 12:19:16 +00:00 · 2004-02-26 18:27:02 +00:00 · 2004-01-14 13:30:49 +00:00 · 2003-12-11 23:31:15 +00:00 · 2003-09-12 17:09:29 +00:00
7 changed files with 26 additions and 24 deletions
--- a/cstdint_test.cpp
+++ b/cstdint_test.cpp
@ -1,21 +1,18 @@
 //  boost cstdint.hpp test program  ------------------------------------------//

-//  (C) Copyright Beman Dawes 2000. Permission to copy, use, modify, sell
-//  and distribute this software is granted provided this copyright
-//  notice appears in all copies. This software is provided "as is" without
-//  express or implied warranty, and with no claim as to its suitability for
-//  any purpose.
+//  Copyright Beman Dawes 2000.
+//  See accompanying license for terms and conditions of use.

-//  See http://www.boost.org for most recent version including documentation.
+//  See http://www.boost.org/libs/integer for documentation.

 //  Revision History
 //   11 Sep 01  Adapted to work with macros defined in native stdint.h (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
+#define __STDC_CONSTANT_MACROS
 #include <cassert>
 #include <iostream>
-#define __STDC_CONSTANT_MACROS
 #include <boost/cstdint.hpp>

 #ifdef NDEBUG
--- a/include/boost/cstdint.hpp
+++ b/include/boost/cstdint.hpp
@ -131,7 +131,7 @@ namespace boost {

 #else  // BOOST_HAS_STDINT_H

-# include <limits.h> // implementation artifact; not part of interface
+# include <boost/limits.hpp> // implementation artifact; not part of interface


 namespace boost
@ -245,6 +245,15 @@ namespace boost
 #    else
 #       error defaults not correct; you must hand modify boost/cstdint.hpp
 #    endif
+# elif defined(__GNUC__) && defined(BOOST_HAS_LONG_LONG)
+     __extension__ typedef long long            intmax_t;
+     __extension__ typedef unsigned long long   uintmax_t;
+     __extension__ typedef long long            int64_t;
+     __extension__ typedef long long            int_least64_t;
+     __extension__ typedef long long            int_fast64_t;
+     __extension__ typedef unsigned long long   uint64_t;
+     __extension__ typedef unsigned long long   uint_least64_t;
+     __extension__ typedef unsigned long long   uint_fast64_t;
 # elif defined(BOOST_HAS_MS_INT64)
     //
     // we have Borland/Intel/Microsoft __int64:
--- a/include/boost/integer.hpp
+++ b/include/boost/integer.hpp
@ -1,10 +1,7 @@
 //  boost integer.hpp header file  -------------------------------------------//

-//  (C) Copyright Beman Dawes 1999. Permission to copy, use, modify, sell
-//  and distribute this software is granted provided this copyright
-//  notice appears in all copies. This software is provided "as is" without
-//  express or implied warranty, and with no claim as to its suitability for
-//  any purpose.
+//  Copyright Beman Dawes 1999.
+//  See accompanying license for terms and conditions of use.

 //  See http://www.boost.org/libs/integer for documentation.

--- a/include/boost/integer_traits.hpp
+++ b/include/boost/integer_traits.hpp
@ -99,13 +99,14 @@ class integer_traits<wchar_t>
 #elif (defined(__sgi) && (!defined(__SGI_STL_PORT) || __SGI_STL_PORT < 0x400))\
    || (defined __APPLE__)\
    || (defined(__OpenBSD__) && defined(__GNUC__))\
+    || (defined(__NetBSD__) && defined(__GNUC__))\
    || (defined(__FreeBSD__) && defined(__GNUC__))\
    || (defined(__hpux) && defined(__GNUC__) && (__GNUC__ == 3) && !defined(__SGI_STL_PORT))
    // No WCHAR_MIN and WCHAR_MAX, wchar_t has the same range as int.
    //  - SGI MIPSpro with native library
    //  - gcc 3.x on HP-UX
    //  - Mac OS X with native library
-    //  - gcc on FreeBSD
+    //  - gcc on FreeBSD, OpenBSD and NetBSD
    public detail::integer_traits_base<wchar_t, INT_MIN, INT_MAX>
 #elif defined(__hpux) && defined(__GNUC__) && (__GNUC__ == 2) && !defined(__SGI_STL_PORT)
    // No WCHAR_MIN and WCHAR_MAX, wchar_t has the same range as unsigned int.
@ -215,3 +216,4 @@ class integer_traits<unsigned long long>
 #endif /* BOOST_INTEGER_TRAITS_HPP */


+
--- a/index.html
+++ b/index.html
--- a/integer_test.cpp
+++ b/integer_test.cpp
@ -1,12 +1,9 @@
 //  boost integer.hpp test program  ------------------------------------------//

-//  (C) Copyright Beman Dawes 1999. Permission to copy, use, modify, sell
-//  and distribute this software is granted provided this copyright
-//  notice appears in all copies. This software is provided "as is" without
-//  express or implied warranty, and with no claim as to its suitability for
-//  any purpose.
+//  Copyright Beman Dawes 1999.
+//  See accompanying license for terms and conditions of use.

-//  See http://www.boost.org for most recent version including documentation.
+//  See http://www.boost.org/libs/integer for documentation.

 //  Revision History
 //   04 Oct 01  Added tests for new templates; rewrote code (Daryle Walker)
--- a/integer_traits_test.cpp
+++ b/integer_traits_test.cpp
@ -55,14 +55,14 @@ void runtest(const char * type, T)
 {
  typedef boost::integer_traits<T> traits;
  std::cout << "Checking " << type
-            << "; min is " << make_char_numeric_for_streaming(traits::min())
-            << ", max is " << make_char_numeric_for_streaming(traits::max())
+            << "; min is " << make_char_numeric_for_streaming((traits::min)())
+            << ", max is " << make_char_numeric_for_streaming((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());
+  BOOST_TEST(traits::const_min == (traits::min)());
+  BOOST_TEST(traits::const_max == (traits::max)());
 }

 int test_main(int, char*[])
Author	SHA1	Message	Date
nobody	af13a2a500	This commit was manufactured by cvs2svn to create branch 'function_signature_patches_1_31'. [SVN r22633]	2004-04-13 12:19:16 +00:00
Eric Niebler	4862574bb1	remove minmax hack from win32.hpp and fix all places that could be affected by the minmax macros [SVN r22394]	2004-02-26 18:27:02 +00:00
John Maddock	f2d22d091f	Patches for cstdint support: cygwin and mingw now use native stdint headers. default header now compiles in -pedantic -ansi mode with gcc. [SVN r21728]	2004-01-14 13:30:49 +00:00
Beman Dawes	1e6ab2dc10	index.htm renamed index.html [SVN r21231]	2003-12-11 23:31:15 +00:00
Beman Dawes	a656e7744f	Change license message to reference Boost Software License [SVN r20038]	2003-09-12 17:09:29 +00:00
John Maddock	46fdbba4b8	Added NetBSD patches from Angus Leeming [SVN r19804]	2003-08-27 10:30:53 +00:00
Douglas Gregor	f2ea03679b	Make sure to define __STDC_CONSTANT_MACROS before we include anything [SVN r19747]	2003-08-23 13:21:30 +00:00
Beman Dawes	890e28ab67	include <boost/limits.hpp> instead of <limits.h>, fixing a date-time issue on Comeau [SVN r18499]	2003-05-22 18:09:32 +00:00