This commit was manufactured by cvs2svn to create tag

'Version_1_34_0'. [SVN r37679]
Fix
2026-08-06 21:44:08 +02:00 · 2007-05-12 21:59:40 +00:00 · 2006-11-10 21:03:16 +00:00 · 2006-11-10 19:59:52 +00:00 · 2006-11-06 17:10:46 +00:00 · 2006-07-17 04:17:11 +00:00
8 changed files with 41 additions and 75 deletions
@@ -44,7 +44,7 @@
 #define BOOST_CAST_HPP

 # include <boost/config.hpp>
-# include <cassert>
+# include <boost/assert.hpp>
 # include <typeinfo>
 # include <boost/type.hpp>
 # include <boost/limits.hpp>
@@ -55,7 +55,7 @@
 //  appear in the function's argument list.
 //
 //  TODO: Add this to config.hpp?
-# if defined(BOOST_MSVC) && BOOST_MSVC <= 1200 // 1200 = VC6
+# if defined(BOOST_MSVC) && BOOST_MSVC < 1300
 #  define BOOST_EXPLICIT_DEFAULT_TARGET , ::boost::type<Target>* = 0
 # else
 #  define BOOST_EXPLICIT_DEFAULT_TARGET
@@ -82,17 +82,19 @@ namespace boost

 //  polymorphic_downcast  ----------------------------------------------------//

-    //  assert() checked polymorphic downcast.  Crosscasts prohibited.
+    //  BOOST_ASSERT() checked polymorphic downcast.  Crosscasts prohibited.

-    //  WARNING: Because this cast uses assert(), it violates the One Definition
-    //  Rule if NDEBUG is inconsistently defined across translation units.
+    //  WARNING: Because this cast uses BOOST_ASSERT(), it violates
+    //  the One Definition Rule if used in multiple translation units
+    //  where BOOST_DISABLE_ASSERTS, BOOST_ENABLE_ASSERT_HANDLER
+    //  NDEBUG are defined inconsistently.

    //  Contributed by Dave Abrahams

    template <class Target, class Source>
    inline Target polymorphic_downcast(Source* x BOOST_EXPLICIT_DEFAULT_TARGET)
    {
-        assert( dynamic_cast<Target>(x) == x );  // detect logic error
+        BOOST_ASSERT( dynamic_cast<Target>(x) == x );  // detect logic error
        return static_cast<Target>(x);
    }

@@ -23,12 +23,6 @@ inline T implicit_cast (typename mpl::identity<T>::type x) {
 //template <typename T>
 //void implicit_cast (...);

-// Macro for when you need a constant expression (Gennaro Prota)
-#define BOOST_IMPLICIT_CAST(dst_type, expr)           \
-          ( sizeof( implicit_cast<dst_type>(expr) )   \
-                     ,                                \
-            static_cast<dst_type>(expr)               \
-          )

 } // namespace boost

@@ -30,8 +30,7 @@

 #if defined(BOOST_NO_STRINGSTREAM) || \
    defined(BOOST_NO_STD_WSTRING) || \
-    defined(BOOST_NO_STD_LOCALE) || \
-    defined(BOOST_NO_INTRINSIC_WCHAR_T)
+    defined(BOOST_NO_STD_LOCALE) 
 #define DISABLE_WIDE_CHAR_SUPPORT
 #endif

@@ -81,11 +80,13 @@ namespace boost
        };

        #ifndef DISABLE_WIDE_CHAR_SUPPORT
+#if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
        template<>
        struct stream_char<wchar_t>
        {
            typedef wchar_t type;
        };
+#endif

        template<>
        struct stream_char<wchar_t *>
@@ -4,7 +4,7 @@
 	<head>
 		<title>lexical_cast</title>
 		<meta name="author" content="Kevlin Henney, mailto:kevlin@curbralan.com">
-		<meta name="generator" content="Microsoft FrontPage 4.0">
+		<meta name="generator" content="Microsoft FrontPage 5.0">
 	</head>
 	<body bgcolor="#FFFFFF" text="#000000">
 		<h1><img src="../../boost.png" alt="boost.png (6897 bytes)" align="center" width="277" height="86">Header
@@ -77,7 +77,7 @@
 			conversions, such as where precision or formatting need tighter control than is 
 			offered by the default behavior of <code>lexical_cast</code>, the conventional <code>
 				stringstream</code> approach is recommended. Where the conversions are 
-			numeric to numeric, <code><a href="cast.htm#numeric_cast">numeric_cast</a></code>
+			numeric to numeric, <code><a href="../numeric/conversion/doc/numeric_cast.html">numeric_cast</a></code>
 			may offer more reasonable behavior than <code>lexical_cast</code>.
 		<p>
 			For a good discussion of the options and issues involved in string-based 
@@ -89,8 +89,7 @@
 			<h2><a name="examples">Examples</a></h2>
 			The following example treats command line arguments as a sequence of numeric 
 			data: <blockquote>
-				<pre>
-int main(int argc, char * argv[])
+				<pre>int main(int argc, char * argv[])
 {
    using boost::lexical_cast;
    using boost::bad_lexical_cast;
@@ -112,8 +111,7 @@ int main(int argc, char * argv[])
 }
 </pre>
 			</blockquote>The following example uses numeric data in a string expression: <blockquote>
-				<pre>
-void log_message(const std::string &amp;);
+				<pre>void log_message(const std::string &amp;);

 void log_errno(int yoko)
 {
@@ -125,12 +123,11 @@ void log_errno(int yoko)
 			<h2><a name="synopsis">Synopsis</a></h2>
 			Library features defined in <a href="../../boost/lexical_cast.hpp"><code>&quot;boost/lexical_cast.hpp&quot;</code></a>:
 			<blockquote>
-				<pre>
-namespace boost
+				<pre>namespace boost
 {
    class <a href="#bad_lexical_cast">bad_lexical_cast</a>;
    template&lt;typename Target, typename Source&gt;
-      Target <a href="#lexical_cast">lexical_cast</a>(Source arg);
+      Target <a href="#lexical_cast">lexical_cast</a>(const Source&amp; arg);
 }
 </pre>
 			</blockquote>Unit test defined in <a href="lexical_cast_test.cpp"><code>&quot;lexical_cast_test.cpp&quot;</code></a>.
@@ -138,9 +135,8 @@ namespace boost
 			<hr>
 			<h2><a name="lexical_cast"><code>lexical_cast</code></a></h2>
 			<blockquote>
-				<pre>
-template&lt;typename Target, typename Source&gt;
-  Target lexical_cast(Source arg);
+				<pre>template&lt;typename Target, typename Source&gt;
+  Target lexical_cast(const Source&amp; arg);
 </pre>
 			</blockquote>Returns the result of streaming <code>arg</code> into a
 			standard library string-based stream and then out as a <code>Target</code> object.
@@ -186,8 +182,7 @@ template&lt;typename Target, typename Source&gt;
 			<hr>
 			<h2><a name="bad_lexical_cast"><code>bad_lexical_cast</code></a></h2>
 			<blockquote>
-				<pre>
-class bad_lexical_cast : public std::bad_cast
+				<pre>class bad_lexical_cast : public std::bad_cast
 {
 public:
    ... // <i>same member function interface as</i> std::exception
@@ -236,4 +231,4 @@ public:
 			
 <div align="right"><small><i>&copy; Copyright Kevlin Henney, 2000&#150;2005</i></small></div>
 	</body>
-</html>
+</html>
@@ -19,13 +19,13 @@
 #endif

 #include <boost/lexical_cast.hpp>
+
+#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
-#include <boost/test/included/unit_test_framework.hpp>

 #if defined(BOOST_NO_STRINGSTREAM) || \
    defined(BOOST_NO_STD_WSTRING) || \
-    defined(BOOST_NO_STD_LOCALE) || \
-    defined(BOOST_NO_INTRINSIC_WCHAR_T)
+    defined(BOOST_NO_STD_LOCALE)
 #define DISABLE_WIDE_CHAR_SUPPORT
 #endif

@@ -45,7 +45,7 @@ void test_conversion_to_wstring();
 void test_bad_lexical_cast();
 void test_no_whitespace_stripping();

-unit_test_framework::test_suite *init_unit_test_suite(int, char **)
+unit_test::test_suite *init_unit_test_suite(int, char *[])
 {
    unit_test_framework::test_suite *suite =
        BOOST_TEST_SUITE("lexical_cast unit test");
@@ -203,34 +203,40 @@ void test_conversion_to_pointer()

 void test_conversion_from_wchar_t()
 {
-    #ifndef DISABLE_WIDE_CHAR_SUPPORT
+#ifndef DISABLE_WIDE_CHAR_SUPPORT
+#if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
    BOOST_CHECK_EQUAL(1, lexical_cast<int>(L'1'));
    BOOST_CHECK_THROW(lexical_cast<int>(L'A'), bad_lexical_cast);
+#endif

    BOOST_CHECK_EQUAL(123, lexical_cast<int>(L"123"));
    BOOST_CHECK_THROW(lexical_cast<int>(L""), bad_lexical_cast);
    BOOST_CHECK_THROW(lexical_cast<int>(L"Test"), bad_lexical_cast);

+#if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
    BOOST_CHECK_EQUAL(1.0, lexical_cast<double>(L'1'));
    BOOST_CHECK_THROW(lexical_cast<double>(L'A'), bad_lexical_cast);
+#endif

    BOOST_CHECK_EQUAL(1.23, lexical_cast<double>(L"1.23"));
    BOOST_CHECK_THROW(lexical_cast<double>(L""), bad_lexical_cast);
    BOOST_CHECK_THROW(lexical_cast<double>(L"Test"), bad_lexical_cast);

+#if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
    BOOST_CHECK_EQUAL(true, lexical_cast<bool>(L'1'));
    BOOST_CHECK_EQUAL(false, lexical_cast<bool>(L'0'));
    BOOST_CHECK_THROW(lexical_cast<bool>(L'A'), bad_lexical_cast);
+#endif
    BOOST_CHECK_EQUAL(true, lexical_cast<bool>(L"1"));
    BOOST_CHECK_EQUAL(false, lexical_cast<bool>(L"0"));
    BOOST_CHECK_THROW(lexical_cast<bool>(L""), bad_lexical_cast);
    BOOST_CHECK_THROW(lexical_cast<bool>(L"Test"), bad_lexical_cast);
-    #endif
+#endif
 }

 void test_conversion_to_wchar_t()
 {
-    #ifndef DISABLE_WIDE_CHAR_SUPPORT
+#if !defined(DISABLE_WIDE_CHAR_SUPPORT) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
    BOOST_CHECK_EQUAL(L'1', lexical_cast<wchar_t>(1));
    BOOST_CHECK_EQUAL(L'0', lexical_cast<wchar_t>(0));
    BOOST_CHECK_THROW(lexical_cast<wchar_t>(123), bad_lexical_cast);
@@ -279,8 +285,10 @@ void test_conversion_to_wstring()
    BOOST_CHECK(L"1.111111111" == lexical_cast<std::wstring>(1.111111111));
    BOOST_CHECK(L"1" == lexical_cast<std::wstring>(true));
    BOOST_CHECK(L"0" == lexical_cast<std::wstring>(false));
+#if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
    BOOST_CHECK(L"A" == lexical_cast<std::wstring>(L'A'));
    BOOST_CHECK(L" " == lexical_cast<std::wstring>(L' '));
+#endif
    BOOST_CHECK(L"Test" == lexical_cast<std::wstring>(L"Test"));
    BOOST_CHECK(L" " == lexical_cast<std::wstring>(L" "));
    BOOST_CHECK(L"" == lexical_cast<std::wstring>(L""));
@@ -1,33 +0,0 @@
-# Signals library
-
-# 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.
-
-# For more information, see http://www.boost.org/
-
-
-# Testing Jamfile autogenerated from XML source
-subproject libs/conversion/test ;
-
-# bring in rules for testing
-import testing ;
-
-# Make tests run by default.
-DEPENDS all : test ;
-
-{
-  test-suite conversion
-      : [ run implicit_cast.cpp ]
-        [ compile-fail implicit_cast_fail.cpp ]
-        [ run ../cast_test.cpp ]
-        [ run ../lexical_cast_test.cpp ]
-      ;
-}
-      
@@ -20,7 +20,7 @@ test-suite conversion
    [ compile-fail implicit_cast_fail.cpp ]
    [ run ../cast_test.cpp ]
    [ run ../numeric_cast_test.cpp ]    
-    [ run ../lexical_cast_test.cpp ]
+    [ run ../lexical_cast_test.cpp ../../test/build//boost_unit_test_framework/<link>static ]
  ;

-      
+      
@@ -4,9 +4,8 @@
 // http://www.boost.org/LICENSE_1_0.txt)

 #include <boost/implicit_cast.hpp>
-#include <cassert>
+#include <boost/detail/lightweight_test.hpp>
 #include <boost/type.hpp>
-
 using boost::implicit_cast;
 using boost::type;

@@ -25,9 +24,9 @@ typedef type<foo> foo_type;
 int main()
 {
    type<long> x = check_return(boost::implicit_cast<long>(1));
-    assert(boost::implicit_cast<long>(1) == 1L);
+    BOOST_TEST(boost::implicit_cast<long>(1) == 1L);

    type<foo> f = check_return(boost::implicit_cast<foo>("hello"));
    type<long> z = check_return(boost::implicit_cast<long>(foo("hello")));
-    return 0;
+    return boost::report_errors();
 }
Author	SHA1	Message	Date
nobody	ddcd4f4764	This commit was manufactured by cvs2svn to create tag 'Version_1_34_0'. [SVN r37679]	2007-05-12 21:59:40 +00:00
Vladimir Prus	37d07617d1	Fix [SVN r35993]	2006-11-10 21:03:16 +00:00
Vladimir Prus	bfeb60c400	Merge from HEAD. Allow building of shared versions of some Boost.Test libraries. Adjust tests to use always use static linking to Boost.Test, since linking to the shared version requires test changes. Patch from Juergen Hunold. [SVN r35990]	2006-11-10 19:59:52 +00:00
Rene Rivera	78f1acc5ff	Remove obsolete Boost.Build v1 files. [SVN r35880]	2006-11-06 17:10:46 +00:00
Gennaro Prota	abf3aa23de	removed erroneous macro version [SVN r34578]	2006-07-17 04:17:11 +00:00
Gennaro Prota	06e7d986d2	fixed library name, copyright notice, removed a tab char and a space-only line; NOTE: is the copyright notice autogenerated? [SVN r34573]	2006-07-17 03:08:48 +00:00
nobody	74fc01da7e	This commit was manufactured by cvs2svn to create branch 'RC_1_34_0'. [SVN r33417]	2006-03-21 02:26:31 +00:00
Dave Abrahams	80e9edcb29	Stop using assert() in tests [SVN r33181]	2006-02-28 22:56:33 +00:00
Beman Dawes	17ca3a4493	show arg as pased by const ref [SVN r32840]	2006-02-12 01:17:17 +00:00
Vladimir Prus	e5a0aec661	Revert (supposedly mistaken) removal of 'numeric_cast_test.cpp' from the list of tests. [SVN r32701]	2006-02-07 11:36:24 +00:00
Vladimir Prus	8cec2cc291	Update Jamfile.v2 [SVN r32700]	2006-02-07 11:35:31 +00:00
Stefan Slapeta	027a566e09	Small fix for new init_unit_test_suite signature [SVN r32293]	2006-01-12 11:59:09 +00:00
Markus Schöpflin	9a29a753e8	Fixed lexical_cast_test which was no longer working after the last test framework update. [SVN r32176]	2005-12-28 11:05:31 +00:00
John Maddock	cb2bd8076d	Reconfigure lexical_cast to work wide character strings and VC++ when not using /Zc:wchar_t. [SVN r30724]	2005-08-29 12:44:09 +00:00
John Maddock	1637edf8ca	Large patch from Ulrich Eckhardt to fix support for EVC++ 4. [SVN r30670]	2005-08-25 16:27:28 +00:00
Douglas Gregor	72d69ef6ad	Merged from 1.33.0 release [SVN r30540]	2005-08-12 13:02:37 +00:00