Subject: [Boost-commit] svn:boost r59465 - trunk/boost/exception/detail
From: emil_at_[hidden]
Date: 2010-02-04 03:14:29
Author: emildotchevski
Date: 2010-02-04 03:14:27 EST (Thu, 04 Feb 2010)
New Revision: 59465
URL: http://svn.boost.org/trac/boost/changeset/59465
Log:
copy_exception ambiguity problem with c++0x
Text files modified:
trunk/boost/exception/detail/exception_ptr.hpp | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
Modified: trunk/boost/exception/detail/exception_ptr.hpp
==============================================================================
--- trunk/boost/exception/detail/exception_ptr.hpp (original)
+++ trunk/boost/exception/detail/exception_ptr.hpp 2010-02-04 03:14:27 EST (Thu, 04 Feb 2010)
@@ -73,7 +73,7 @@
exception_ptr
get_bad_alloc()
{
- static exception_ptr e = copy_exception(
+ static exception_ptr e = boost::copy_exception(
bad_alloc_() <<
throw_function("boost::current_exception()") <<
throw_file(__FILE__) <<
@@ -209,23 +209,23 @@
current_exception_std_exception( T const & 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
- return copy_exception(current_exception_std_exception_wrapper<T>(e1));
+ return boost::copy_exception(current_exception_std_exception_wrapper<T>(e1));
}
inline
exception_ptr
current_exception_unknown_exception()
{
- return copy_exception(unknown_exception());
+ return boost::copy_exception(unknown_exception());
}
inline
exception_ptr
current_exception_unknown_boost_exception( boost::exception const & e )
{
- return copy_exception(unknown_exception(e));
+ return boost::copy_exception(unknown_exception(e));
}
inline
@@ -235,7 +235,7 @@
if( boost::exception const * be = get_boost_exception(&e) )
return current_exception_unknown_boost_exception(*be);
else
- return copy_exception(unknown_exception(e));
+ return boost::copy_exception(unknown_exception(e));
}
inline