Ticket #2343: boost_exception2.patch

exception.hpp

@@ -6 +6 @@
 #ifndef UUID_274DA366004E11DCB1DDFE2E56D89593
 #define UUID_274DA366004E11DCB1DDFE2E56D89593
 
+#include <boost/config.hpp>
+
 namespace
 boost
     {
@@ -313 +315 @@
     exception_detail::enable_error_info_return_type<T>::type
     enable_error_info( T const & x )
         {
-        return typename exception_detail::enable_error_info_return_type<T>::type(x);
+        return BOOST_CTOR_TYPENAME exception_detail::enable_error_info_return_type<T>::type(x);
         }
 
     ////////////////////////////////////////////////////////////////////////

get_error_info.hpp

@@ -10 +10 @@
 #include <boost/exception/detail/error_info_impl.hpp>
 #include <boost/exception/detail/type_info.hpp>
 #include <boost/shared_ptr.hpp>
+#include <boost/detail/workaround.hpp>
 #include <string.h>
 
 namespace
@@ -42 +43 @@
                 {
                 size_t n=1+strlen(s);
                 char * str = new char[n];
+#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x610))
+                (void) ::std::memcpy(str,s,n);
+#else
                 (void) memcpy(str,s,n);
+#endif
                 return str;
                 }
             };