This commit was manufactured by cvs2svn to create tag

'Version_1_30_0'.

[SVN r18026]

include/boost/lexical_cast.hpp

@@ -18,7 +18,6 @@
 #include <typeinfo>
 #include <boost/config.hpp>
 #include <boost/limits.hpp>
-#include <boost/throw_exception.hpp>
 #include <boost/type_traits/is_pointer.hpp>
 
 #ifdef BOOST_NO_STRINGSTREAM
@@ -30,47 +29,51 @@
 #if defined(BOOST_NO_STRINGSTREAM) || \
     defined(BOOST_NO_STD_WSTRING) || \
     defined(BOOST_NO_STD_LOCALE) || \
-    defined(BOOST_NO_INTRINSIC_WCHAR_T)
+    defined(BOOST_NO_CWCHAR) || \
+    defined(BOOST_MSVC) && (BOOST_MSVC <= 1200)
 #define DISABLE_WIDE_CHAR_SUPPORT
 #endif
 
+#ifdef BOOST_NO_INTRINSIC_WCHAR_T
+#include <cwchar>
+#endif
+
 namespace boost
 {
     // exception used to indicate runtime lexical_cast failure
     class bad_lexical_cast : public std::bad_cast
     {
     public:
-        bad_lexical_cast() :
-        source(&typeid(void)), target(&typeid(void))
-        {
-        }
-        bad_lexical_cast(
-            const std::type_info &s,
-            const std::type_info &t) :
-            source(&s), target(&t)
-        {
-        }
-        const std::type_info &source_type() const
-        {
-            return *source;
-        }
-        const std::type_info &target_type() const
-        {
-            return *target;
-        }
-        virtual const char *what() const throw()
-        {
-            return "bad lexical cast: "
-                   "source type value could not be interpreted as target";
-        }
         virtual ~bad_lexical_cast() throw()
         {
         }
-    private:
-        const std::type_info *source;
-        const std::type_info *target;
     };
 
+    namespace detail // actual underlying concrete exception type
+    {
+        template<typename Target, typename Source>
+        class no_lexical_conversion : public bad_lexical_cast
+        {
+        public:
+            no_lexical_conversion()
+              : description(
+                  std::string() + "bad lexical cast: " +
+                  "source type value could not be interpreted as target, Target=" +
+                  typeid(Target).name() + ", Source=" + typeid(Source).name())
+            {
+            }
+            virtual ~no_lexical_conversion() throw()
+            {
+            }
+            virtual const char *what() const throw()
+            {
+                return description.c_str();
+            }
+        private:
+            const std::string description; // static initialization fails on MSVC6
+        };
+    }
+
     namespace detail // selectors for choosing stream character type
     {
         template<typename Type>
@@ -141,7 +144,7 @@ namespace boost
             }
             bool operator<<(const Source &input)
             {
-                return !(stream << input).fail();
+                return stream << input;
             }
             template<typename InputStreamable>
             bool operator>>(InputStreamable &output)
@@ -187,7 +190,7 @@ namespace boost
         Target result;
 
         if(!(interpreter << arg && interpreter >> result))
-            throw_exception(bad_lexical_cast(typeid(Target), typeid(Source)));
+            throw detail::no_lexical_conversion<Target, Source>();
         return result;
     }
 }
@@ -202,4 +205,3 @@ namespace boost
 
 #undef DISABLE_WIDE_CHAR_SUPPORT
 #endif
-

lexical_cast_test.cpp

@@ -25,7 +25,8 @@
 #if defined(BOOST_NO_STRINGSTREAM) || \
     defined(BOOST_NO_STD_WSTRING) || \
     defined(BOOST_NO_STD_LOCALE) || \
-    defined(BOOST_NO_INTRINSIC_WCHAR_T)
+    defined(BOOST_NO_CWCHAR) || \
+    defined(BOOST_MSVC) && (BOOST_MSVC <= 1200)
 #define DISABLE_WIDE_CHAR_SUPPORT
 #endif
 
@@ -36,7 +37,6 @@ void test_conversion_to_int();
 void test_conversion_to_double();
 void test_conversion_to_bool();
 void test_conversion_to_string();
-void test_conversion_from_to_wchar_t_alias();
 void test_conversion_to_pointer();
 void test_conversion_from_wchar_t();
 void test_conversion_to_wchar_t();
@@ -51,7 +51,6 @@ unit_test_framework::test_suite *init_unit_test_suite(int, char **)
     suite->add(BOOST_TEST_CASE(test_conversion_to_int));
     suite->add(BOOST_TEST_CASE(test_conversion_to_double));
     suite->add(BOOST_TEST_CASE(test_conversion_to_bool));
-    suite->add(BOOST_TEST_CASE(test_conversion_from_to_wchar_t_alias));
     suite->add(BOOST_TEST_CASE(test_conversion_to_pointer));
     suite->add(BOOST_TEST_CASE(test_conversion_to_string));
     #ifndef DISABLE_WIDE_CHAR_SUPPORT
@@ -181,17 +180,6 @@ void test_conversion_to_string()
     BOOST_CHECK_EQUAL("", lexical_cast<std::string>(std::string("")));
 }
 
-void test_conversion_from_to_wchar_t_alias()
-{
-    BOOST_CHECK_EQUAL(123u, lexical_cast<unsigned short>("123"));
-    BOOST_CHECK_EQUAL(123u, lexical_cast<unsigned int>("123"));
-    BOOST_CHECK_EQUAL(123u, lexical_cast<unsigned long>("123"));
-    BOOST_CHECK_EQUAL(std::string("123"),
-        lexical_cast<std::string>(static_cast<unsigned short>(123)));
-    BOOST_CHECK_EQUAL(std::string("123"), lexical_cast<std::string>(123u));
-    BOOST_CHECK_EQUAL(std::string("123"), lexical_cast<std::string>(123ul));
-}
-
 void test_conversion_to_pointer()
 {
     BOOST_CHECK_THROW(lexical_cast<char *>("Test"), boost::bad_lexical_cast);