feedc0de/boost_throw_exception
1
0
Fork 0
forked from boostorg/throw_exception
Code Pull Requests Activity

Boost Exception now works with BOOST_NO_RTTI and/or BOOST_NO_TYPEID.

Browse Source 
[SVN r48429]
This commit is contained in:
Emil Dotchevski
2008-08-28 23:49:55 +00:00
committed by Peter Dimov
parent 512ad21a54
commit c857f3b36d
2 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@
#ifndef UUID_274DA366004E11DCB1DDFE2E56D89593 #ifndef UUID_274DA366004E11DCB1DDFE2E56D89593
#define UUID_274DA366004E11DCB1DDFE2E56D89593 #define UUID_274DA366004E11DCB1DDFE2E56D89593
#include <boost/config.hpp> #include <boost/exception/detail/type_info.hpp>
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#include <boost/exception/detail/counted_base.hpp> #include <boost/exception/detail/counted_base.hpp>
#include <boost/intrusive_ptr.hpp> #include <boost/intrusive_ptr.hpp>
@ -15,6 +15,8 @@
namespace namespace
boost boost
{ {
class exception;
template <class T> template <class T>
class shared_ptr; class shared_ptr;
@ -27,21 +29,17 @@ boost
error_info_container: error_info_container:
public exception_detail::counted_base public exception_detail::counted_base
{ {
virtual char const * diagnostic_information( char const *, std::type_info const & ) const = 0; virtual char const * diagnostic_information( char const *, char const * ) const = 0;
virtual shared_ptr<error_info_base const> get( std::type_info const & ) const = 0; virtual shared_ptr<error_info_base const> get( type_info_ const & ) const = 0;
virtual void set( shared_ptr<error_info_base const> const & ) = 0; virtual void set( shared_ptr<error_info_base const> const &, type_info_ const & ) = 0;
}; };
template <class ErrorInfo>
shared_ptr<typename ErrorInfo::value_type const> get_data( exception const & );
void set_data( exception const *, shared_ptr<exception_detail::error_info_base const> const &, exception_detail::type_info_ const & );
} }
template <class Tag,class T>
class error_info;
template <class E,class Tag,class T>
E const & operator<<( E const &, error_info<Tag,T> const & );
template <class ErrorInfo,class E>
shared_ptr<typename ErrorInfo::value_type const> get_error_info( E const & );
class class
exception exception
{ {
@ -71,14 +69,14 @@ boost
if( data_ ) if( data_ )
try try
{ {
char const * w = data_->diagnostic_information(std_what,typeid(*this)); char const * w = data_->diagnostic_information(std_what,dynamic_type_name());
BOOST_ASSERT(0!=w); BOOST_ASSERT(w!=0);
return w; return w;
} }
catch(...) catch(...)
{ {
} }
return std_what ? std_what : typeid(*this).name(); return std_what ? std_what : dynamic_type_name();
} }
#if BOOST_WORKAROUND( BOOST_MSVC, BOOST_TESTED_AT(1500) ) #if BOOST_WORKAROUND( BOOST_MSVC, BOOST_TESTED_AT(1500) )
@ -96,14 +94,22 @@ boost
private: private:
shared_ptr<exception_detail::error_info_base const> get( std::type_info const & ) const; friend void exception_detail::set_data( exception const *, shared_ptr<exception_detail::error_info_base const> const &, exception_detail::type_info_ const & );
void set( shared_ptr<exception_detail::error_info_base const> const & ) const;
template <class E,class Tag,class T> template <class ErrorInfo>
friend E const & operator<<( E const &, error_info<Tag,T> const & ); friend shared_ptr<typename ErrorInfo::value_type const> exception_detail::get_data( exception const & );
template <class ErrorInfo,class E> char const *
friend shared_ptr<typename ErrorInfo::value_type const> get_error_info( E const & ); dynamic_type_name() const
{
return
#if defined(BOOST_NO_RTTI) || defined(BOOST_NO_TYPEID)
"Unknown type deriving from boost::exception"
#else
typeid(*this).name()
#endif
;
}
mutable intrusive_ptr<exception_detail::error_info_container> data_; mutable intrusive_ptr<exception_detail::error_info_container> data_;
}; };

2
include/boost/throw_exception.hpp
View File

@ -24,7 +24,7 @@
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#include <exception> #include <exception>
#if !defined( BOOST_EXCEPTION_DISABLE ) && defined( BOOST_NO_TYPEID ) #if !defined( BOOST_EXCEPTION_DISABLE )
#define BOOST_EXCEPTION_DISABLE #define BOOST_EXCEPTION_DISABLE
#endif #endif