Index: exception.hpp =================================================================== --- exception.hpp (revision 91) +++ exception.hpp (working copy) @@ -6,6 +6,8 @@ #ifndef UUID_274DA366004E11DCB1DDFE2E56D89593 #define UUID_274DA366004E11DCB1DDFE2E56D89593 +#include + namespace boost { @@ -313,7 +315,7 @@ exception_detail::enable_error_info_return_type::type enable_error_info( T const & x ) { - return typename exception_detail::enable_error_info_return_type::type(x); + return BOOST_CTOR_TYPENAME exception_detail::enable_error_info_return_type::type(x); } //////////////////////////////////////////////////////////////////////// Index: get_error_info.hpp =================================================================== --- get_error_info.hpp (revision 91) +++ get_error_info.hpp (working copy) @@ -10,6 +10,7 @@ #include #include #include +#include #include namespace @@ -42,7 +43,11 @@ { 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; } };