boostorg/exception
1
0
Fork 1
mirror of https://github.com/boostorg/exception.git synced 2025-07-21 08:22:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improving CodeGear C++Builder 2009 compatibility

Browse Source 
[SVN r48918]
This commit is contained in:
Emil Dotchevski
2008-09-22 18:27:58 +00:00
parent 1c5df6b59a
commit 4cb98696a6
3 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/boost/exception/exception.hpp
View File

@ -313,7 +313,8 @@ boost
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);
typedef typename exception_detail::enable_error_info_return_type<T>::type rt;
return rt(x);
}
////////////////////////////////////////////////////////////////////////

31
include/boost/exception/get_error_info.hpp
View File

@ -10,7 +10,6 @@
#include <boost/exception/detail/error_info_impl.hpp>
#include <boost/exception/detail/type_info.hpp>
#include <boost/shared_ptr.hpp>
#include <string.h>
namespace
boost
@ -21,30 +20,16 @@ boost
struct
strwrap
{
char const * str;
std::string str;
char const * ptr;
strwrap( char const * s ):
str(init(s))
str(s),
ptr(&str[0])
{
}
~strwrap()
{
delete[] str;
}
private:
strwrap( strwrap const & );
strwrap & operator=( strwrap const & );
static
char const *
init( char const * s )
{
size_t n=1+strlen(s);
char * str = new char[n];
(void) memcpy(str,s,n);
return str;
}
};
template <>
@ -55,10 +40,10 @@ boost
shared_ptr<char const * const>
get( exception const & x )
{
if( x.throw_function_ )
if( x.throw_function_ && *x.throw_function_ )
{
shared_ptr<strwrap> s(new strwrap(x.throw_function_));
return shared_ptr<char const *>(s,&s->str);
return shared_ptr<char const *>(s,&s->ptr);
}
else
return shared_ptr<char const * const>();
@ -73,10 +58,10 @@ boost
shared_ptr<char const * const>
get( exception const & x )
{
if( x.throw_file_ )
if( x.throw_file_ && *x.throw_file_ )
{
shared_ptr<strwrap> s(new strwrap(x.throw_file_));
return shared_ptr<char const *>(s,&s->str);
return shared_ptr<char const *>(s,&s->ptr);
}
else
return shared_ptr<char const * const>();

2
include/boost/exception_ptr.hpp
View File

@ -99,7 +99,7 @@ boost
private:
clone_base const *
exception_detail::clone_base const *
clone() const
{
return new unknown_exception(*this);