mirror of
https://github.com/boostorg/exception.git
synced 2025-07-21 00:12:07 +02:00
copy_exception ambiguity problem with c++0x
[SVN r59465]
This commit is contained in:
@ -73,7 +73,7 @@ boost
|
|||||||
exception_ptr
|
exception_ptr
|
||||||
get_bad_alloc()
|
get_bad_alloc()
|
||||||
{
|
{
|
||||||
static exception_ptr e = copy_exception(
|
static exception_ptr e = boost::copy_exception(
|
||||||
bad_alloc_() <<
|
bad_alloc_() <<
|
||||||
throw_function("boost::current_exception()") <<
|
throw_function("boost::current_exception()") <<
|
||||||
throw_file(__FILE__) <<
|
throw_file(__FILE__) <<
|
||||||
@ -209,23 +209,23 @@ boost
|
|||||||
current_exception_std_exception( T const & e1 )
|
current_exception_std_exception( T const & e1 )
|
||||||
{
|
{
|
||||||
if( boost::exception const * e2 = get_boost_exception(&e1) )
|
if( boost::exception const * e2 = get_boost_exception(&e1) )
|
||||||
return copy_exception(current_exception_std_exception_wrapper<T>(e1,*e2));
|
return boost::copy_exception(current_exception_std_exception_wrapper<T>(e1,*e2));
|
||||||
else
|
else
|
||||||
return copy_exception(current_exception_std_exception_wrapper<T>(e1));
|
return boost::copy_exception(current_exception_std_exception_wrapper<T>(e1));
|
||||||
}
|
}
|
||||||
|
|
||||||
inline
|
inline
|
||||||
exception_ptr
|
exception_ptr
|
||||||
current_exception_unknown_exception()
|
current_exception_unknown_exception()
|
||||||
{
|
{
|
||||||
return copy_exception(unknown_exception());
|
return boost::copy_exception(unknown_exception());
|
||||||
}
|
}
|
||||||
|
|
||||||
inline
|
inline
|
||||||
exception_ptr
|
exception_ptr
|
||||||
current_exception_unknown_boost_exception( boost::exception const & e )
|
current_exception_unknown_boost_exception( boost::exception const & e )
|
||||||
{
|
{
|
||||||
return copy_exception(unknown_exception(e));
|
return boost::copy_exception(unknown_exception(e));
|
||||||
}
|
}
|
||||||
|
|
||||||
inline
|
inline
|
||||||
@ -235,7 +235,7 @@ boost
|
|||||||
if( boost::exception const * be = get_boost_exception(&e) )
|
if( boost::exception const * be = get_boost_exception(&e) )
|
||||||
return current_exception_unknown_boost_exception(*be);
|
return current_exception_unknown_boost_exception(*be);
|
||||||
else
|
else
|
||||||
return copy_exception(unknown_exception(e));
|
return boost::copy_exception(unknown_exception(e));
|
||||||
}
|
}
|
||||||
|
|
||||||
inline
|
inline
|
||||||
|
Reference in New Issue
Block a user