Ticket #4115: lexicalCastNoTypeInfoFix.patch

config/stdlib/dinkumware.hpp

@@ -86 +86 @@
 #  define BOOST_NO_STD_LOCALE
 #endif
 
+#if defined(_HAS_EXCEPTIONS) && (_HAS_EXCEPTIONS == 0)
+#  define BOOST_NO_STD_TYPEINFO   
+#endif 
+
 //  C++0x headers implemented in 520 (as shipped by Microsoft)
 //
 #if !defined(_CPPLIB_VER) || _CPPLIB_VER < 520

lexical_cast.hpp

@@ -52 +52 @@
     throw_exception(bad_lexical_cast(typeid(Source), typeid(Target)))
 #endif
 
+// Define BOOST_LCAST_STD_NS to the namespace that contains type_info.
+#ifdef BOOST_NO_STD_TYPEINFO
+// Embedded VC++ does not have type_info in namespace std
+#  define BOOST_LCAST_STD_NS
+#else
+#  define BOOST_LCAST_STD_NS std
+#endif
+
 namespace boost
 {
     // exception used to indicate runtime lexical_cast failure
@@ -74 +82 @@
         }
 
         bad_lexical_cast(
-            const std::type_info &source_type_arg,
-            const std::type_info &target_type_arg) :
+            const BOOST_LCAST_STD_NS::type_info &source_type_arg,
+            const BOOST_LCAST_STD_NS::type_info &target_type_arg) :
             source(&source_type_arg), target(&target_type_arg)
         {
         }
 
-        const std::type_info &source_type() const
+        const BOOST_LCAST_STD_NS::type_info &source_type() const
         {
             return *source;
         }
-        const std::type_info &target_type() const
+        const BOOST_LCAST_STD_NS::type_info &target_type() const
         {
             return *target;
         }
@@ -98 +106 @@
         {
         }
     private:
-        const std::type_info *source;
-        const std::type_info *target;
+        const BOOST_LCAST_STD_NS::type_info *source;
+        const BOOST_LCAST_STD_NS::type_info *target;
     };
 
     namespace detail // selectors for choosing stream character type
@@ -1149 +1157 @@
 
             Target result;
             if(!(interpreter << arg && interpreter >> result))
-              BOOST_LCAST_THROW_BAD_CAST(Source, Target);
+                BOOST_LCAST_THROW_BAD_CAST(Source, Target);
             return result;
         }
 #if (defined _MSC_VER)