This commit was manufactured by cvs2svn to create tag

'Version_1_32_0'. [SVN r26264]
This commit was manufactured by cvs2svn to create branch 'RC_1_32_0'.
2026-08-06 13:34:14 +02:00 · 2004-11-19 19:19:18 +00:00 · 2004-10-20 08:26:43 +00:00 · 2004-10-05 15:45:52 +00:00 · 2004-09-29 11:44:04 +00:00 · 2004-09-28 21:48:39 +00:00
13 changed files with 173 additions and 147 deletions
@@ -13,7 +13,7 @@
  </head>

  <body bgcolor="#FFFFFF" text="#000000">
-    <h1><img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)" align=
+    <h1><img src="../../boost.png" alt="boost.png (6897 bytes)" align=
    "middle" width="277" height="86">Header <a href=
    "../../boost/cast.hpp">boost/cast.hpp</a></h1>

@@ -1,14 +1,13 @@
 //  boost utility cast test program  -----------------------------------------//

-//  (C) Copyright boost.org 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.
+//  (C) Copyright Beman Dawes, Dave Abrahams 1999. 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)

 //  See http://www.boost.org for most recent version including documentation.

 //  Revision History
+//   28 Set 04  factored out numeric_cast<> test (Fernando Cacciola)
 //   20 Jan 01  removed use of <limits> for portability to raw GCC (David Abrahams)
 //   28 Jun 00  implicit_cast removed (Beman Dawes)
 //   30 Aug 99  value_cast replaced by numeric_cast
@@ -21,7 +20,7 @@

 #  if SCHAR_MAX == LONG_MAX
 #      error "This test program doesn't work if SCHAR_MAX == LONG_MAX"
-#  endif 
+#  endif

 using namespace boost;
 using std::cout;
@@ -29,39 +28,34 @@ using std::cout;
 namespace
 {
    struct Base
-    { 
+    {
        virtual char kind() { return 'B'; }
    };
-    
+
    struct Base2
-    { 
+    {
        virtual char kind2() { return '2'; }
    };
-    
+
    struct Derived : public Base, Base2
    {
        virtual char kind() { return 'D'; }
-    }; 
-}   
+    };
+}


 int main( int argc, char * argv[] )
 {
-    cout << "Usage: test_casts [n], where n omitted or is:\n"
-            "  1 = execute #1 assert failure (#ifndef NDEBUG)\n"
-            "  2 = execute #2 assert failure (#ifndef NDEBUG)\n"
-            "Example: test_casts 2\n\n";
-
 #   ifdef NDEBUG
        cout << "NDEBUG is defined\n";
 #   else
        cout << "NDEBUG is not defined\n";
 #   endif

-    cout << "\nBeginning tests...\n";        
+    cout << "\nBeginning tests...\n";

 //  test polymorphic_cast  ---------------------------------------------------//
-    
+
    //  tests which should succeed
    Base *    base = new Derived;
    Base2 *   base2 = 0;
@@ -91,63 +85,6 @@ int main( int argc, char * argv[] )
    //  the following is just so generated code can be inspected
    if ( derived->kind() == 'B' ) ++err_count;

-//  test implicit_cast and numeric_cast  -------------------------------------//
-    
-    //  tests which should succeed
-    long small_value = 1;
-    long small_negative_value = -1;
-    long large_value = LONG_MAX;
-    long large_negative_value = LONG_MIN;
-    signed char c = 0;
-
-    c = large_value;  // see if compiler generates warning
-
-    c = numeric_cast<signed char>( small_value );
-    assert( c == 1 );
-    c = 0;
-    c = numeric_cast<signed char>( small_value );
-    assert( c == 1 );
-    c = 0;
-    c = numeric_cast<signed char>( small_negative_value );
-    assert( c == -1 );
-
-    // These tests courtesy of Joe R NWP Swatosh<joe.r.swatosh@usace.army.mil>
-    assert( 0.0f == numeric_cast<float>( 0.0 ) );
-    assert( 0.0 == numeric_cast<double>( 0.0 ) );
-    
-    //  tests which should result in errors being detected
-
-    caught_exception = false;
-    try { c = numeric_cast<signed char>( large_value ); }
-    catch (bad_numeric_cast)
-        { cout<<"caught bad_numeric_cast #1\n"; caught_exception = true; }
-    if ( !caught_exception ) ++err_count;
-
-    caught_exception = false;
-    try { c = numeric_cast<signed char>( large_negative_value ); }
-    catch (bad_numeric_cast)
-        { cout<<"caught bad_numeric_cast #2\n"; caught_exception = true; }
-    if ( !caught_exception ) ++err_count;
-
-    unsigned long ul;
-    caught_exception = false;
-    try { ul = numeric_cast<unsigned long>( large_negative_value ); }
-    catch (bad_numeric_cast)
-        { cout<<"caught bad_numeric_cast #3\n"; caught_exception = true; }
-    if ( !caught_exception ) ++err_count;
-
-    caught_exception = false;
-    try { ul = numeric_cast<unsigned long>( small_negative_value ); }
-    catch (bad_numeric_cast)
-        { cout<<"caught bad_numeric_cast #4\n"; caught_exception = true; }
-    if ( !caught_exception ) ++err_count;
-
-    caught_exception = false;
-    try { numeric_cast<int>( DBL_MAX ); }
-    catch (bad_numeric_cast)
-        { cout<<"caught bad_numeric_cast #5\n"; caught_exception = true; }
-    if ( !caught_exception ) ++err_count;
-
    cout << err_count << " errors detected\nTest "
         << (err_count==0 ? "passed\n" : "failed\n");
    return err_count;
@@ -1,10 +1,9 @@
 //  boost cast.hpp header file  ----------------------------------------------//

-//  (C) Copyright boost.org 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.
+//  (C) Copyright Kevlin Henney and Dave Abrahams 1999. 
+//  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)

 //  See http://www.boost.org/libs/conversion for Documentation.

@@ -129,12 +128,12 @@ namespace boost
      template <class T>
      struct signed_numeric_limits : std::numeric_limits<T>
      {
-             static inline T min()
+             static inline T min BOOST_PREVENT_MACRO_SUBSTITUTION ()
         {
-             return std::numeric_limits<T>::min() >= 0
+             return (std::numeric_limits<T>::min)() >= 0
                     // unary minus causes integral promotion, thus the static_cast<>
-                     ? static_cast<T>(-std::numeric_limits<T>::max())
-                     : std::numeric_limits<T>::min();
+                     ? static_cast<T>(-(std::numeric_limits<T>::max)())
+                     : (std::numeric_limits<T>::min)();
         };
      };
   
@@ -157,11 +156,11 @@ namespace boost
      // long / unsigned long long. Not intended to be full
      // numeric_limits replacements, but good enough for numeric_cast<>
      template <>
-      struct fixed_numeric_limits_base<long long, false>
+      struct fixed_numeric_limits_base< ::boost::long_long_type, false>
      {
          BOOST_STATIC_CONSTANT(bool, is_specialized = true);
          BOOST_STATIC_CONSTANT(bool, is_signed = true);
-          static long long max()
+          static  ::boost::long_long_type max BOOST_PREVENT_MACRO_SUBSTITUTION ()
          {
 #  ifdef LONGLONG_MAX
              return LONGLONG_MAX;
@@ -170,7 +169,7 @@ namespace boost
 #  endif 
          }

-          static long long min()
+          static  ::boost::long_long_type min BOOST_PREVENT_MACRO_SUBSTITUTION ()
          {
 #  ifdef LONGLONG_MIN
              return LONGLONG_MIN;
@@ -181,11 +180,11 @@ namespace boost
      };

      template <>
-      struct fixed_numeric_limits_base<unsigned long long, false>
+      struct fixed_numeric_limits_base< ::boost::ulong_long_type, false>
      {
          BOOST_STATIC_CONSTANT(bool, is_specialized = true);
          BOOST_STATIC_CONSTANT(bool, is_signed = false);
-          static unsigned long long max()
+          static  ::boost::ulong_long_type max BOOST_PREVENT_MACRO_SUBSTITUTION ()
          {
 #  ifdef ULONGLONG_MAX
              return ULONGLONG_MAX;
@@ -194,7 +193,7 @@ namespace boost
 #  endif 
          }

-          static unsigned long long min() { return 0; }
+          static  ::boost::ulong_long_type min BOOST_PREVENT_MACRO_SUBSTITUTION () { return 0; }
      };
 # endif 
    } // namespace detail
@@ -314,10 +313,10 @@ namespace boost
       template <class T>
       struct fixed_numeric_limits : public std::numeric_limits<T>
       {
-           static inline T min()
+           static inline T min BOOST_PREVENT_MACRO_SUBSTITUTION ()
           {
-               return std::numeric_limits<T>::is_signed && std::numeric_limits<T>::min() >= 0
-                   ? T(-std::numeric_limits<T>::max()) : std::numeric_limits<T>::min();
+               return std::numeric_limits<T>::is_signed && (std::numeric_limits<T>::min)() >= 0
+                   ? T(-(std::numeric_limits<T>::max)()) : (std::numeric_limits<T>::min)();
           }
       };
  
@@ -351,8 +350,8 @@ namespace boost
        const bool result_is_signed = result_traits::is_signed;
        const bool same_sign = arg_is_signed == result_is_signed;

-        if (less_than_type_min<arg_is_signed, result_is_signed>::check(arg, result_traits::min())
-            || greater_than_type_max<same_sign, arg_is_signed>::check(arg, result_traits::max())
+        if (less_than_type_min<arg_is_signed, result_is_signed>::check(arg, (result_traits::min)())
+            || greater_than_type_max<same_sign, arg_is_signed>::check(arg, (result_traits::max)())
            )
            
 #else // We need to use #pragma hacks if available
@@ -364,8 +363,8 @@ namespace boost
 #pragma option push -w-8012
 # endif
        if ((arg < 0 && !result_traits::is_signed)  // loss of negative range
-             || (arg_traits::is_signed && arg < result_traits::min())  // underflow
-             || arg > result_traits::max())            // overflow
+             || (arg_traits::is_signed && arg < (result_traits::min)())  // underflow
+             || arg > (result_traits::max)())            // overflow
 # if BOOST_MSVC
 #  pragma warning(pop)
 #elif defined(__BORLANDC__)
@@ -1,8 +1,7 @@
-// Copyright David Abrahams 2003. 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 David Abrahams 2003.
+// 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)
 #ifndef IMPLICIT_CAST_DWA200356_HPP
 # define IMPLICIT_CAST_DWA200356_HPP

@@ -194,11 +194,9 @@ namespace boost

 // Copyright Kevlin Henney, 2000-2003. All rights reserved.
 //
-// Permission to use, copy, modify, and distribute this software for any
-// purpose is hereby granted without fee, provided that this copyright and
-// permissions notice appear in all copies and derivatives.
-//
-// This software is provided "as is" without express or implied warranty.
+// 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)

 #undef DISABLE_WIDE_CHAR_SUPPORT
 #endif
@@ -10,7 +10,7 @@

 <body bgcolor="#FFFFFF" text="#000000">

-<h1><img border="0" src="../../c++boost.gif" align="center" width="277" height="86">Boost
+<h1><img border="0" src="../../boost.png" align="center" width="277" height="86">Boost
 Conversion Library</h1>

 <p>The Conversion Library improves program safety and clarity by performing
@@ -7,7 +7,7 @@
 		<meta name="generator" content="Microsoft FrontPage 4.0">
 	</head>
 	<body bgcolor="#FFFFFF" text="#000000">
-		<h1><img src="../../c++boost.gif" alt="c++boost.gif (8819 bytes)" align="center" width="277" height="86">Header
+		<h1><img src="../../boost.png" alt="boost.png (6897 bytes)" align="center" width="277" height="86">Header
 			<a href="../../boost/lexical_cast.hpp">boost/lexical_cast.hpp</a></h1>
 		<ul type="square">
 			<li>
@@ -1,14 +1,12 @@
-// Unit test for boost::lexical_cast.
+//  Unit test for boost::lexical_cast.
 //
-// See http://www.boost.org for most recent version, including documentation.
+//  See http://www.boost.org for most recent version, including documentation.
 //
-// Copyright Terje Slettebø and Kevlin Henney, 2003.
+//  Copyright Terje Slettebø and Kevlin Henney, 2003.
 //
-// Permission to use, copy, modify, and distribute this software for any
-// purpose is hereby granted without fee, provided that this copyright and
-// permissions notice appear in all copies and derivatives.
-//
-// This software is provided "as is" without express or implied warranty.
+//  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).

 #include <boost/config.hpp>

@@ -92,8 +90,8 @@ void test_conversion_to_int()
    BOOST_CHECK_THROW(lexical_cast<int>('A'),boost::bad_lexical_cast);
    BOOST_CHECK_EQUAL(1,lexical_cast<int>(1));
    BOOST_CHECK_EQUAL(
-        std::numeric_limits<int>::max(),
-        lexical_cast<int>(std::numeric_limits<int>::max()));
+        (std::numeric_limits<int>::max)(),
+        lexical_cast<int>((std::numeric_limits<int>::max)()));
    BOOST_CHECK_EQUAL(1,lexical_cast<int>(1.0));

    BOOST_CHECK_THROW(lexical_cast<int>(1.23), boost::bad_lexical_cast);
@@ -123,8 +121,8 @@ void test_conversion_to_double()
    BOOST_CHECK_EQUAL(1.0, lexical_cast<double>(1));
    BOOST_CHECK_EQUAL(1.23, lexical_cast<double>(1.23));
    BOOST_CHECK_CLOSE(
-        std::numeric_limits<double>::max() / 2,
-        lexical_cast<double>(std::numeric_limits<double>::max() / 2),
+        (std::numeric_limits<double>::max)() / 2,
+        lexical_cast<double>((std::numeric_limits<double>::max)() / 2),
        std::numeric_limits<double>::epsilon());
    BOOST_CHECK_EQUAL(1.0, lexical_cast<double>(true));
    BOOST_CHECK_EQUAL(0.0, lexical_cast<double>(false));
@@ -0,0 +1,100 @@
+//  boost utility cast test program  -----------------------------------------//
+
+//  (C) Copyright Beman Dawes, Dave Abrahams 1999. 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)
+
+//  See http://www.boost.org for most recent version including documentation.
+
+//  Revision History
+//   28 Set 04  factored out numeric_cast<> test (Fernando Cacciola)
+//   20 Jan 01  removed use of <limits> for portability to raw GCC (David Abrahams)
+//   28 Jun 00  implicit_cast removed (Beman Dawes)
+//   30 Aug 99  value_cast replaced by numeric_cast
+//    3 Aug 99  Initial Version
+
+#include <iostream>
+#include <climits>
+#include <cfloat>   // for DBL_MAX (Peter Schmid)
+#include <boost/cast.hpp>
+
+#include "boost/test/minimal.hpp"
+
+#  if SCHAR_MAX == LONG_MAX
+#      error "This test program doesn't work if SCHAR_MAX == LONG_MAX"
+#  endif
+
+using namespace boost;
+using std::cout;
+
+
+int test_main( int argc, char * argv[] )
+{
+
+#   ifdef NDEBUG
+        cout << "NDEBUG is defined\n";
+#   else
+        cout << "NDEBUG is not defined\n";
+#   endif
+
+    cout << "\nBeginning tests...\n";
+
+//  test implicit_cast and numeric_cast  -------------------------------------//
+
+    //  tests which should succeed
+    long small_value = 1;
+    long small_negative_value = -1;
+    long large_value = LONG_MAX;
+    long large_negative_value = LONG_MIN;
+    signed char c = 0;
+
+    c = large_value;  // see if compiler generates warning
+
+    c = numeric_cast<signed char>( small_value );
+    BOOST_CHECK( c == 1 );
+    c = 0;
+    c = numeric_cast<signed char>( small_value );
+    BOOST_CHECK( c == 1 );
+    c = 0;
+    c = numeric_cast<signed char>( small_negative_value );
+    BOOST_CHECK( c == -1 );
+
+    // These tests courtesy of Joe R NWP Swatosh<joe.r.swatosh@usace.army.mil>
+    BOOST_CHECK( 0.0f == numeric_cast<float>( 0.0 ) );
+    BOOST_CHECK( 0.0 == numeric_cast<double>( 0.0 ) );
+
+    //  tests which should result in errors being detected
+
+    bool caught_exception = false;
+    try { c = numeric_cast<signed char>( large_value ); }
+    catch (bad_numeric_cast)
+        { cout<<"caught bad_numeric_cast #1\n"; caught_exception = true; }
+    BOOST_CHECK ( caught_exception );
+
+    caught_exception = false;
+    try { c = numeric_cast<signed char>( large_negative_value ); }
+    catch (bad_numeric_cast)
+        { cout<<"caught bad_numeric_cast #2\n"; caught_exception = true; }
+    BOOST_CHECK ( caught_exception );
+
+    unsigned long ul;
+    caught_exception = false;
+    try { ul = numeric_cast<unsigned long>( large_negative_value ); }
+    catch (bad_numeric_cast)
+        { cout<<"caught bad_numeric_cast #3\n"; caught_exception = true; }
+    BOOST_CHECK ( caught_exception );
+
+    caught_exception = false;
+    try { ul = numeric_cast<unsigned long>( small_negative_value ); }
+    catch (bad_numeric_cast)
+        { cout<<"caught bad_numeric_cast #4\n"; caught_exception = true; }
+    BOOST_CHECK ( caught_exception );
+
+    caught_exception = false;
+    try { numeric_cast<int>( DBL_MAX ); }
+    catch (bad_numeric_cast)
+        { cout<<"caught bad_numeric_cast #5\n"; caught_exception = true; }
+    BOOST_CHECK ( caught_exception );
+
+    return 0 ;
+}
@@ -303,10 +303,6 @@ namespace test // tester is the driver class for a sequence of tests

 // Copyright Kevlin Henney, 2000. All rights reserved.
 //
-// Permission to use, copy, modify, and distribute this software for any
-// purpose is hereby granted without fee, provided that this copyright and
-// permissions notice appear in all copies and derivatives, and that no
-// charge may be made for the software and its documentation except to cover
-// cost of distribution.
-//
-// This software is provided "as is" without express or implied warranty.
+// 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)
@@ -2,13 +2,13 @@

 # Copyright (C) 2001-2003 Douglas Gregor

-# Permission to copy, use, sell and distribute this software is granted 
-# provided this copyright notice appears in all copies. Permission to modify 
-# the code and to distribute modified code is granted provided this copyright 
-# notice appears in all copies, and a notice that the code was modified is 
-# included with the copyright notice. This software is provided "as is" 
-# without express or implied warranty, and with no claim as to its suitability 
-# for any purpose. 
+# Permission to copy, use, sell and distribute this software is granted
+# provided this copyright notice appears in all copies. Permission to modify
+# the code and to distribute modified code is granted provided this copyright
+# notice appears in all copies, and a notice that the code was modified is
+# included with the copyright notice. This software is provided "as is"
+# without express or implied warranty, and with no claim as to its suitability
+# for any purpose.

 # For more information, see http://www.boost.org/

@@ -27,6 +27,7 @@ DEPENDS all : test ;
      : [ run implicit_cast.cpp ]
        [ compile-fail implicit_cast_fail.cpp ]
        [ run ../cast_test.cpp ]
+        [ run ../numeric_cast_test.cpp ]
        [ run ../lexical_cast_test.cpp ]
      ;
 }
@@ -1,8 +1,7 @@
-// Copyright David Abrahams 2003. 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 David Abrahams 2003.
+// 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)

 #include <boost/implicit_cast.hpp>
 #include <cassert>
@@ -1,8 +1,7 @@
-// Copyright David Abrahams 2003. 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 David Abrahams 2003.
+// 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)

 #include <boost/implicit_cast.hpp>
 #include <boost/type.hpp>
Author	SHA1	Message	Date
nobody	b3d53db6c5	This commit was manufactured by cvs2svn to create tag 'Version_1_32_0'. [SVN r26264]	2004-11-19 19:19:18 +00:00
nobody	dfca010fb3	This commit was manufactured by cvs2svn to create branch 'RC_1_32_0'. [SVN r25797]	2004-10-20 08:26:43 +00:00
Aleksey Gurtovoy	b8c373ab47	c++boost.gif -> boost.png replacement [SVN r25573]	2004-10-05 15:45:52 +00:00
Aleksey Gurtovoy	f6b0ec3685	fix syntax errors [SVN r25473]	2004-09-29 11:44:04 +00:00
Fernando Cacciola	a096a4b153	numeric_cast<> test factored out from conversion\cast_test.cp and also added (duplicated) in numeric\conversion\test [SVN r25468]	2004-09-28 21:48:39 +00:00
John Maddock	bba9169401	Updated to use the BSL: Permission from Kevlin Henney was granted in blanket-permission.txt, permission from Terje Slettebo was granted for this one file privately. [SVN r25402]	2004-09-25 15:06:48 +00:00
John Maddock	f11967a2c8	BSL update [SVN r25146]	2004-09-16 11:23:30 +00:00
John Maddock	c1c338990c	Added new types boost::long_long_type and boost::ulong_long_type in boost/config.hpp and applied these types in place of "long long" throughout. As a result, almost all of boost now compiles cleanly with -ansi -pedantic with gcc. Changes tested with gcc 3.3, 2.95, VC7.1 and Intel 8. [SVN r24899]	2004-09-04 10:34:49 +00:00
John Maddock	ec35f00bc3	Removed boost.org copyright assignments, and reverted to orginal author (as based on cvs history). [SVN r24402]	2004-08-11 10:59:33 +00:00
Douglas Gregor	abf8ee0eb9	Converted to Boost Software License, Version 1.0 [SVN r24055]	2004-07-26 00:32:12 +00:00
Eric Niebler	463284f46f	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