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

minor diagnostic_information maintenance, updated documentation

Browse Source 
[SVN r58131]
This commit is contained in:
Emil Dotchevski
2009-12-04 01:29:22 +00:00
parent dc75da0dc4
commit 58a49ff77e
7 changed files with 8333 additions and 8351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/boost/exception/detail/exception_ptr.hpp
View File

@ -42,8 +42,7 @@ boost
void rethrow_exception( exception_ptr const & );
class
exception_ptr:
public exception_detail::exception_ptr_base
exception_ptr
{
typedef bool exception_ptr::*unspecified_bool_type;
friend exception_ptr current_exception();
@ -72,7 +71,7 @@ boost
}
void
_rethrow() const
rethrow() const
{
BOOST_ASSERT(*this);
if( bad_alloc_ )
@ -82,7 +81,7 @@ boost
}
bool
_empty() const
empty() const
{
return !bad_alloc_ && !c_;
}
@ -100,7 +99,7 @@ boost
operator unspecified_bool_type() const
{
return _empty() ? 0 : &exception_ptr::bad_alloc_;
return empty() ? 0 : &exception_ptr::bad_alloc_;
}
friend
@ -443,7 +442,24 @@ boost
void
rethrow_exception( exception_ptr const & p )
{
p._rethrow();
p.rethrow();
}
inline
std::string
diagnostic_information( exception_ptr const & p )
{
if( p )
try
{
rethrow_exception(p);
}
catch(
... )
{
return current_exception_diagnostic_information();
}
return "<empty>";
}
inline

36
include/boost/exception/detail/exception_ptr_base.hpp
View File

@ -1,36 +0,0 @@
//Copyright (c) 2006-2009 Emil Dotchevski and Reverge Studios, Inc.
//Distributed under the Boost Software License, Version 1.0. (See accompanying
//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#ifndef UUID_DC4208C6417811DEBF11E1EC55D89593
#define UUID_DC4208C6417811DEBF11E1EC55D89593
#if defined(__GNUC__) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
#pragma GCC system_header
#endif
namespace
boost
{
namespace
exception_detail
{
class
exception_ptr_base
{
public:
virtual void _rethrow() const=0;
virtual bool _empty() const=0;
protected:
~exception_ptr_base() throw()
{
}
};
}
}
#endif

92
include/boost/exception/diagnostic_information.hpp
View File

@ -12,13 +12,37 @@
#include <boost/config.hpp>
#include <boost/exception/get_error_info.hpp>
#include <boost/exception/detail/exception_ptr_base.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/config.hpp>
#include <exception>
#include <sstream>
#include <string>
#ifndef BOOST_NO_EXCEPTIONS
#include <boost/exception/current_exception_cast.hpp>
namespace
boost
{
namespace
exception_detail
{
std::string diagnostic_information_impl( boost::exception const *, std::exception const *, bool );
}
inline
std::string
current_exception_diagnostic_information()
{
boost::exception const * be=current_exception_cast<boost::exception const>();
std::exception const * se=current_exception_cast<std::exception const>();
if( be || se )
return exception_detail::diagnostic_information_impl(be,se,true);
else
return "No diagnostic information available.";
}
}
#endif
namespace
boost
{
@ -27,7 +51,7 @@ boost
{
template <class T>
struct
enable_boost_exception_overload
is_convertible_to_boost_exception
{
struct yes { char q[100]; };
typedef char no;
@ -38,13 +62,13 @@ boost
template <class T>
struct
enable_std_exception_overload
is_convertible_to_std_exception
{
struct yes { char q[100]; };
typedef char no;
static yes check(std::exception const *);
static no check(...);
enum e { value = !enable_boost_exception_overload<T>::value && sizeof(check((T*)0))==sizeof(yes) };
enum e { value = sizeof(check((T*)0))==sizeof(yes) };
};
inline
@ -70,12 +94,13 @@ boost
std::string
diagnostic_information_impl( boost::exception const * be, std::exception const * se, bool with_what )
{
BOOST_ASSERT(be||se);
if( !be && !se )
return "Unknown exception.";
#ifndef BOOST_NO_RTTI
if( !se )
se = dynamic_cast<std::exception const *>(be);
if( !be )
be = dynamic_cast<boost::exception const *>(se);
be=dynamic_cast<boost::exception const *>(se);
if( !se )
se=dynamic_cast<std::exception const *>(be);
#endif
char const * wh=0;
if( with_what && se )
@ -115,19 +140,12 @@ boost
}
template <class T>
inline
typename enable_if<exception_detail::enable_boost_exception_overload<T>,std::string>::type
std::string
diagnostic_information( T const & e )
{
return exception_detail::diagnostic_information_impl(&e,0,true);
}
template <class T>
inline
typename enable_if<exception_detail::enable_std_exception_overload<T>,std::string>::type
diagnostic_information( T const & e )
{
return exception_detail::diagnostic_information_impl(0,&e,true);
boost::exception const * be=exception_detail::is_convertible_to_boost_exception<T>::value?((boost::exception const *)&e):0;
std::exception const * se=exception_detail::is_convertible_to_std_exception<T>::value?((std::exception const *)&e):0;
return exception_detail::diagnostic_information_impl(be,se,true);
}
inline
@ -152,40 +170,4 @@ boost
}
}
#ifndef BOOST_NO_EXCEPTIONS
#include <boost/exception/current_exception_cast.hpp>
namespace
boost
{
inline
std::string
current_exception_diagnostic_information()
{
boost::exception const * be=current_exception_cast<boost::exception const>();
std::exception const * se=current_exception_cast<std::exception const>();
if( be || se )
return exception_detail::diagnostic_information_impl(be,se,true);
else
return "No diagnostic information available.";
}
inline
std::string
diagnostic_information( exception_detail::exception_ptr_base const & p )
{
if( !p._empty() )
try
{
p._rethrow();
}
catch(
... )
{
return current_exception_diagnostic_information();
}
return "<empty>";
}
}
#endif
#endif