|
|
Boost-Commit : |
From: emil_at_[hidden]
Date: 2008-08-28 19:49:57
Author: emildotchevski
Date: 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
New Revision: 48429
URL: http://svn.boost.org/trac/boost/changeset/48429
Log:
Boost Exception now works with BOOST_NO_RTTI and/or BOOST_NO_TYPEID.
Added:
trunk/boost/exception/detail/error_info_base.hpp (contents, props changed)
trunk/boost/exception/detail/get_boost_exception.hpp (contents, props changed)
trunk/boost/exception/detail/type_info.hpp (contents, props changed)
trunk/boost/exception/get_error_info.hpp (contents, props changed)
trunk/libs/exception/test/get_error_info_hpp_test.cpp (contents, props changed)
Text files modified:
trunk/boost/exception.hpp | 1
trunk/boost/exception/detail/object_hex_dump.hpp | 3
trunk/boost/exception/diagnostic_information.hpp | 12 ++
trunk/boost/exception/enable_current_exception.hpp | 21 ++++-
trunk/boost/exception/exception.hpp | 48 +++++++-----
trunk/boost/exception/info.hpp | 142 +++++++++++----------------------------
trunk/boost/exception_ptr.hpp | 6
trunk/boost/throw_exception.hpp | 4
trunk/libs/exception/test/Jamfile.v2 | 1
trunk/libs/exception/test/boost_error_info_test.cpp | 1
trunk/libs/exception/test/diagnostic_information_test.cpp | 40 ++++++++++
trunk/libs/exception/test/enable_error_info_test.cpp | 1
trunk/libs/exception/test/errno_test.cpp | 1
trunk/libs/exception/test/error_info_test.cpp | 27 +++++--
trunk/libs/exception/test/throw_exception_test.cpp | 1
trunk/libs/exception/test/unknown_exception_test.cpp | 1
16 files changed, 165 insertions(+), 145 deletions(-)
Modified: trunk/boost/exception.hpp
==============================================================================
--- trunk/boost/exception.hpp (original)
+++ trunk/boost/exception.hpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -11,6 +11,7 @@
#include <boost/exception/enable_error_info.hpp>
#include <boost/exception/error_info.hpp>
#include <boost/exception/exception.hpp>
+#include <boost/exception/get_error_info.hpp>
#include <boost/exception/info.hpp>
#include <boost/exception/info_tuple.hpp>
#include <boost/exception_ptr.hpp>
Added: trunk/boost/exception/detail/error_info_base.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/exception/detail/error_info_base.hpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -0,0 +1,38 @@
+//Copyright (c) 2006-2008 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_CE6983AC753411DDA764247956D89593
+#define UUID_CE6983AC753411DDA764247956D89593
+
+#include <boost/detail/workaround.hpp>
+#include <string>
+
+namespace
+boost
+ {
+ namespace
+ exception_detail
+ {
+ class
+ error_info_base
+ {
+ public:
+
+ virtual char const * tag_typeid_name() const = 0;
+ virtual std::string value_as_string() const = 0;
+
+ protected:
+
+#if BOOST_WORKAROUND( __GNUC__, BOOST_TESTED_AT(4) )
+virtual //Disable bogus GCC warning.
+#endif
+ ~error_info_base()
+ {
+ }
+ };
+ }
+ }
+
+#endif
Added: trunk/boost/exception/detail/get_boost_exception.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/exception/detail/get_boost_exception.hpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -0,0 +1,47 @@
+//Copyright (c) 2006-2008 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_B9A8291074CA11DD94BFC77156D89593
+#define UUID_B9A8291074CA11DD94BFC77156D89593
+
+#include <boost/exception/exception.hpp>
+
+namespace
+boost
+ {
+ namespace
+ exception_detail
+ {
+#ifdef BOOST_NO_RTTI
+ template <class T>
+ exception const *
+ get_boost_exception( T const * )
+ {
+ try
+ {
+ throw;
+ }
+ catch(
+ exception & x )
+ {
+ return &x;
+ }
+ catch(...)
+ {
+ return 0;
+ }
+ }
+#else
+ template <class T>
+ exception const *
+ get_boost_exception( T const * x )
+ {
+ return dynamic_cast<exception const *>(x);
+ }
+#endif
+ }
+ }
+
+#endif
Modified: trunk/boost/exception/detail/object_hex_dump.hpp
==============================================================================
--- trunk/boost/exception/detail/object_hex_dump.hpp (original)
+++ trunk/boost/exception/detail/object_hex_dump.hpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -6,6 +6,7 @@
#ifndef UUID_6F463AC838DF11DDA3E6909F56D89593
#define UUID_6F463AC838DF11DDA3E6909F56D89593
+#include <boost/exception/detail/type_info.hpp>
#include <iomanip>
#include <typeinfo>
#include <ios>
@@ -24,7 +25,7 @@
object_hex_dump( T const & x, size_t max_size=16 )
{
std::ostringstream s;
- s << "type: " << typeid(x).name() << ", size: " << sizeof(T) << ", dump: ";
+ s << "type: " << type_name<T>() << ", size: " << sizeof(T) << ", dump: ";
size_t n=sizeof(T)>max_size?max_size:sizeof(T);
s.fill('0');
s.width(2);
Added: trunk/boost/exception/detail/type_info.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/exception/detail/type_info.hpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -0,0 +1,62 @@
+//Copyright (c) 2006-2008 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_C3E1741C754311DDB2834CCA55D89593
+#define UUID_C3E1741C754311DDB2834CCA55D89593
+
+#include <boost/detail/sp_typeinfo.hpp>
+#include <boost/current_function.hpp>
+
+namespace
+boost
+ {
+ template <class ErrorInfoTag>
+ inline
+ char const *
+ error_info_value()
+ {
+ return BOOST_CURRENT_FUNCTION;
+ }
+
+ namespace
+ exception_detail
+ {
+ typedef detail::sp_typeinfo type_info_;
+
+#ifdef BOOST_NO_TYPEID
+ typedef type_info_ type_info_wrapper;
+#else
+ struct
+ type_info_wrapper
+ {
+ type_info_ const * type;
+
+ explicit
+ type_info_wrapper( type_info_ const & t ):
+ type(&t)
+ {
+ }
+
+ bool
+ operator<( type_info_wrapper const & b ) const
+ {
+ return 0!=(type->before(*b.type));
+ }
+ };
+#endif
+
+ template <class ErrorInfoTag>
+ inline
+ char const *
+ type_name()
+ {
+ return error_info_value<ErrorInfoTag>();
+ }
+ }
+ }
+
+#define BOOST_EXCEPTION_STATIC_TYPEID(T) BOOST_SP_TYPEID(T)
+
+#endif
Modified: trunk/boost/exception/diagnostic_information.hpp
==============================================================================
--- trunk/boost/exception/diagnostic_information.hpp (original)
+++ trunk/boost/exception/diagnostic_information.hpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -6,7 +6,7 @@
#ifndef UUID_0552D49838DD11DD90146B8956D89593
#define UUID_0552D49838DD11DD90146B8956D89593
-#include <boost/exception/exception.hpp>
+#include <boost/exception/detail/get_boost_exception.hpp>
#include <exception>
#include <string>
@@ -17,10 +17,16 @@
std::string
diagnostic_information( std::exception const & x )
{
- if( exception const * be = dynamic_cast<exception const *>(&x) )
+ if( exception const * be = exception_detail::get_boost_exception(&x) )
return be->diagnostic_information();
else
- return std::string("[ what: ") + x.what() + ", type: " + typeid(x).name() + " ]";
+ return std::string("[ what: ") + x.what() + ", type: "
+#if defined(BOOST_NO_RTTI) || defined(BOOST_NO_TYPEID)
+ "Unknown type deriving from std::exception"
+#else
+ + typeid(x).name() +
+#endif
+ " ]";
}
}
Modified: trunk/boost/exception/enable_current_exception.hpp
==============================================================================
--- trunk/boost/exception/enable_current_exception.hpp (original)
+++ trunk/boost/exception/enable_current_exception.hpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -18,6 +18,19 @@
namespace
exception_detail
{
+ inline
+ void
+ copy_boost_exception( exception * a, exception const * b )
+ {
+ *a = *b;
+ }
+
+ inline
+ void
+ copy_boost_exception( void *, void const * )
+ {
+ }
+
class
clone_base:
public counted_base
@@ -64,9 +77,7 @@
clone_impl( T const & x ):
T(x)
{
- if( boost::exception * be1=dynamic_cast<boost::exception *>(this) )
- if( boost::exception const * be2=dynamic_cast<boost::exception const *>(&x) )
- *be1 = *be2;
+ copy_boost_exception(this,&x);
}
private:
@@ -91,9 +102,7 @@
T(x),
count_(0)
{
- if( boost::exception * be1=dynamic_cast<boost::exception *>(this) )
- if( boost::exception const * be2=dynamic_cast<boost::exception const *>(&x) )
- *be1 = *be2;
+ copy_boost_exception(this,&x);
}
private:
Modified: trunk/boost/exception/exception.hpp
==============================================================================
--- trunk/boost/exception/exception.hpp (original)
+++ trunk/boost/exception/exception.hpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -6,7 +6,7 @@
#ifndef UUID_274DA366004E11DCB1DDFE2E56D89593
#define UUID_274DA366004E11DCB1DDFE2E56D89593
-#include <boost/config.hpp>
+#include <boost/exception/detail/type_info.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/exception/detail/counted_base.hpp>
#include <boost/intrusive_ptr.hpp>
@@ -15,6 +15,8 @@
namespace
boost
{
+ class exception;
+
template <class T>
class shared_ptr;
@@ -27,20 +29,16 @@
error_info_container:
public exception_detail::counted_base
{
- virtual char const * diagnostic_information( char const *, std::type_info const & ) const = 0;
- virtual shared_ptr<error_info_base const> get( std::type_info const & ) const = 0;
- virtual void set( shared_ptr<error_info_base const> const & ) = 0;
+ virtual char const * diagnostic_information( char const *, char 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 &, type_info_ const & ) = 0;
};
- }
-
- 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>
+ shared_ptr<typename ErrorInfo::value_type const> get_data( exception const & );
- template <class ErrorInfo,class E>
- shared_ptr<typename ErrorInfo::value_type const> get_error_info( E const & );
+ void set_data( exception const *, shared_ptr<exception_detail::error_info_base const> const &, exception_detail::type_info_ const & );
+ }
class
exception
@@ -71,14 +69,14 @@
if( data_ )
try
{
- char const * w = data_->diagnostic_information(std_what,typeid(*this));
- BOOST_ASSERT(0!=w);
+ char const * w = data_->diagnostic_information(std_what,dynamic_type_name());
+ BOOST_ASSERT(w!=0);
return w;
}
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) )
@@ -96,14 +94,22 @@
private:
- shared_ptr<exception_detail::error_info_base const> get( std::type_info const & ) const;
- void set( shared_ptr<exception_detail::error_info_base const> const & ) const;
+ friend void exception_detail::set_data( exception const *, shared_ptr<exception_detail::error_info_base const> const &, exception_detail::type_info_ const & );
- template <class E,class Tag,class T>
- friend E const & operator<<( E const &, error_info<Tag,T> const & );
+ template <class ErrorInfo>
+ friend shared_ptr<typename ErrorInfo::value_type const> exception_detail::get_data( exception const & );
- template <class ErrorInfo,class E>
- friend shared_ptr<typename ErrorInfo::value_type const> get_error_info( E const & );
+ char 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_;
};
Added: trunk/boost/exception/get_error_info.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/exception/get_error_info.hpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -0,0 +1,49 @@
+//Copyright (c) 2006-2008 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_1A590226753311DD9E4CCF6156D89593
+#define UUID_1A590226753311DD9E4CCF6156D89593
+
+#include <boost/shared_ptr.hpp>
+#include <boost/exception/detail/get_boost_exception.hpp>
+#include <boost/exception/detail/error_info_base.hpp>
+
+namespace
+boost
+ {
+ namespace
+ exception_detail
+ {
+ template <class ErrorInfo>
+ inline
+ shared_ptr<typename ErrorInfo::value_type const>
+ get_data( exception const & x )
+ {
+ if( x.data_ )
+ if( shared_ptr<exception_detail::error_info_base const> eib = x.data_->get(BOOST_EXCEPTION_STATIC_TYPEID(ErrorInfo)) )
+ {
+#ifndef BOOST_NO_RTTI
+ BOOST_ASSERT( 0!=dynamic_cast<ErrorInfo const *>(eib.get()) );
+#endif
+ ErrorInfo const * w = static_cast<ErrorInfo const *>(eib.get());
+ return shared_ptr<typename ErrorInfo::value_type const>(eib,&w->value());
+ }
+ return shared_ptr<typename ErrorInfo::value_type const>();
+ }
+ }
+
+ template <class ErrorInfo,class E>
+ inline
+ shared_ptr<typename ErrorInfo::value_type const>
+ get_error_info( E const & some_exception )
+ {
+ if( exception const * x = exception_detail::get_boost_exception(&some_exception) )
+ return exception_detail::get_data<ErrorInfo>(*x);
+ else
+ return shared_ptr<typename ErrorInfo::value_type const>();
+ }
+ }
+
+#endif
Modified: trunk/boost/exception/info.hpp
==============================================================================
--- trunk/boost/exception/info.hpp (original)
+++ trunk/boost/exception/info.hpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -6,11 +6,10 @@
#ifndef UUID_8D22C4CA9CC811DCAA9133D256D89593
#define UUID_8D22C4CA9CC811DCAA9133D256D89593
-#include <boost/type.hpp>
#include <boost/exception/exception.hpp>
+#include <boost/exception/detail/error_info_base.hpp>
#include <boost/exception/error_info.hpp>
#include <boost/exception/to_string_stub.hpp>
-#include <boost/current_function.hpp>
#include <boost/shared_ptr.hpp>
#include <map>
@@ -26,28 +25,6 @@
typedef error_info<struct tag_throw_file,char const *> throw_file;
typedef error_info<struct tag_throw_line,int> throw_line;
- namespace
- exception_detail
- {
- class
- error_info_base
- {
- public:
-
- virtual std::type_info const & tag_typeid() const = 0;
- virtual std::string value_as_string() const = 0;
-
- protected:
-
-#if BOOST_WORKAROUND( __GNUC__, BOOST_TESTED_AT(4) )
-virtual //Disable bogus GCC warning.
-#endif
- ~error_info_base()
- {
- }
- };
- }
-
template <class Tag,class T>
class
error_info:
@@ -70,10 +47,10 @@
private:
- std::type_info const &
- tag_typeid() const
+ char const *
+ tag_typeid_name() const
{
- return typeid(type<Tag>);
+ return exception_detail::type_name<Tag>();
}
std::string
@@ -85,31 +62,6 @@
value_type const value_;
};
- template <class E,class Tag,class T>
- inline
- E const &
- operator<<( E const & x, error_info<Tag,T> const & v )
- {
- shared_ptr< error_info<Tag,T> > p( new error_info<Tag,T>(v) );
- x.set(p);
- return x;
- }
-
- template <class ErrorInfo,class E>
- inline
- shared_ptr<typename ErrorInfo::value_type const>
- get_error_info( E const & some_exception )
- {
- if( exception const * x = dynamic_cast<exception const *>(&some_exception) )
- if( shared_ptr<exception_detail::error_info_base const> eib = x->get(typeid(ErrorInfo)) )
- {
- BOOST_ASSERT( 0!=dynamic_cast<ErrorInfo const *>(eib.get()) );
- ErrorInfo const * w = static_cast<ErrorInfo const *>(eib.get());
- return shared_ptr<typename ErrorInfo::value_type const>(eib,&w->value());
- }
- return shared_ptr<typename ErrorInfo::value_type const>();
- }
-
namespace
exception_detail
{
@@ -128,30 +80,33 @@
{
}
+ void
+ set( shared_ptr<error_info_base const> const & x, type_info_ const & typeid_ )
+ {
+ BOOST_ASSERT(x);
+ info_[type_info_wrapper(typeid_)] = x;
+ what_.clear();
+ }
+
shared_ptr<error_info_base const>
- get( std::type_info const & ti ) const
+ get( type_info_ const & ti ) const
{
- error_info_map::const_iterator i=info_.find(typeinfo(ti));
+ error_info_map::const_iterator i=info_.find(type_info_wrapper(ti));
if( info_.end()!=i )
{
shared_ptr<error_info_base const> const & p = i->second;
+ #ifndef BOOST_NO_RTTI
BOOST_ASSERT( typeid(*p)==ti );
+ #endif
return p;
}
return shared_ptr<error_info_base const>();
}
- void
- set( shared_ptr<error_info_base const> const & x )
- {
- BOOST_ASSERT(x);
- info_[typeinfo(typeid(*x))] = x;
- what_.clear();
- }
-
char const *
- diagnostic_information( char const * std_what, std::type_info const & exception_type ) const
+ diagnostic_information( char const * std_what, char const * exception_type_name ) const
{
+ BOOST_ASSERT(exception_type_name!=0 && *exception_type_name );
if( what_.empty() )
{
std::string tmp;
@@ -161,13 +116,13 @@
tmp += '\n';
}
tmp += "Dynamic exception type: ";
- tmp += exception_type.name();
+ tmp += exception_type_name;
tmp += '\n';
for( error_info_map::const_iterator i=info_.begin(),end=info_.end(); i!=end; ++i )
{
shared_ptr<error_info_base const> const & x = i->second;
tmp += '[';
- tmp += x->tag_typeid().name();
+ tmp += x->tag_typeid_name();
tmp += "] = ";
tmp += x->value_as_string();
tmp += '\n';
@@ -181,25 +136,7 @@
friend class exception;
- struct
- typeinfo
- {
- std::type_info const * type;
-
- explicit
- typeinfo( std::type_info const & t ):
- type(&t)
- {
- }
-
- bool
- operator<( typeinfo const & b ) const
- {
- return 0!=(type->before(*b.type));
- }
- };
-
- typedef std::map< typeinfo, shared_ptr<error_info_base const> > error_info_map;
+ typedef std::map< type_info_wrapper, shared_ptr<error_info_base const> > error_info_map;
error_info_map info_;
mutable std::string what_;
mutable int count_;
@@ -217,27 +154,32 @@
delete this;
}
};
- }
- inline
- void
- exception::
- set( shared_ptr<exception_detail::error_info_base const> const & x ) const
- {
- if( !data_ )
- data_ = intrusive_ptr<exception_detail::error_info_container>(new exception_detail::error_info_container_impl);
- data_->set(x);
+ inline
+ void
+ set_data( exception const * e, shared_ptr<exception_detail::error_info_base const> const & x, exception_detail::type_info_ const & typeid_ )
+ {
+ if( !e->data_ )
+ e->data_ = intrusive_ptr<exception_detail::error_info_container>(new exception_detail::error_info_container_impl);
+ e->data_->set(x,typeid_);
+ }
+
+ inline
+ void
+ set_data( void const *, shared_ptr<exception_detail::error_info_base const> const &, exception_detail::type_info_ const & )
+ {
+ }
}
+ template <class E,class Tag,class T>
inline
- shared_ptr<exception_detail::error_info_base const>
- exception::
- get( std::type_info const & ti ) const
+ E const &
+ operator<<( E const & x, error_info<Tag,T> const & v )
{
- if( data_ )
- return data_->get(ti);
- else
- return shared_ptr<exception_detail::error_info_base const>();
+ typedef error_info<Tag,T> error_info_tag_t;
+ shared_ptr<error_info_tag_t> p( new error_info_tag_t(v) );
+ exception_detail::set_data(&x,p,BOOST_EXCEPTION_STATIC_TYPEID(error_info_tag_t));
+ return x;
}
}
Modified: trunk/boost/exception_ptr.hpp
==============================================================================
--- trunk/boost/exception_ptr.hpp (original)
+++ trunk/boost/exception_ptr.hpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -7,7 +7,7 @@
#define UUID_FA5836A2CADA11DC8CD47C8555D89593
#include <boost/exception/enable_current_exception.hpp>
-#include <boost/exception/exception.hpp>
+#include <boost/exception/detail/get_boost_exception.hpp>
#include <boost/exception/detail/cloning_base.hpp>
#include <stdexcept>
#include <new>
@@ -72,7 +72,7 @@
exception_ptr
current_exception_std_exception( T const & e1 )
{
- if( boost::exception const * e2 = dynamic_cast<boost::exception const *>(&e1) )
+ if( boost::exception const * e2 = get_boost_exception(&e1) )
return exception_ptr(exception_detail::make_clone(current_exception_std_exception_wrapper<T>(e1,*e2)));
else
return exception_ptr(exception_detail::make_clone(current_exception_std_exception_wrapper<T>(e1)));
@@ -89,7 +89,7 @@
exception_ptr
current_exception_unknown_std_exception( std::exception const & e )
{
- if( boost::exception const * be = dynamic_cast<boost::exception const *>(&e) )
+ if( boost::exception const * be = get_boost_exception(&e) )
return exception_ptr(exception_detail::make_clone(unknown_exception(*be)));
else
return current_exception_unknown_exception();
Modified: trunk/boost/throw_exception.hpp
==============================================================================
--- trunk/boost/throw_exception.hpp (original)
+++ trunk/boost/throw_exception.hpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -24,8 +24,8 @@
#include <boost/detail/workaround.hpp>
#include <exception>
-#if !defined( BOOST_EXCEPTION_DISABLE ) && defined( BOOST_NO_TYPEID )
-# define BOOST_EXCEPTION_DISABLE
+#if !defined( BOOST_EXCEPTION_DISABLE )
+#define BOOST_EXCEPTION_DISABLE
#endif
#if !defined( BOOST_EXCEPTION_DISABLE ) && defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, < 0x590 )
Modified: trunk/libs/exception/test/Jamfile.v2
==============================================================================
--- trunk/libs/exception/test/Jamfile.v2 (original)
+++ trunk/libs/exception/test/Jamfile.v2 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -40,6 +40,7 @@
compile enable_error_info_hpp_test.cpp ;
compile error_info_hpp_test.cpp ;
compile exception_hpp_test.cpp ;
+compile get_error_info_hpp_test.cpp ;
compile info_hpp_test.cpp ;
compile info_tuple_hpp_test.cpp ;
compile to_string_hpp_test.cpp ;
Modified: trunk/libs/exception/test/boost_error_info_test.cpp
==============================================================================
--- trunk/libs/exception/test/boost_error_info_test.cpp (original)
+++ trunk/libs/exception/test/boost_error_info_test.cpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -3,6 +3,7 @@
//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)
+#include <boost/exception/get_error_info.hpp>
#include <boost/exception/info.hpp>
#include <boost/detail/lightweight_test.hpp>
#include <stdexcept>
Modified: trunk/libs/exception/test/diagnostic_information_test.cpp
==============================================================================
--- trunk/libs/exception/test/diagnostic_information_test.cpp (original)
+++ trunk/libs/exception/test/diagnostic_information_test.cpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -7,7 +7,7 @@
#include <boost/exception/info.hpp>
#include <boost/detail/lightweight_test.hpp>
-typedef boost::error_info<struct tag,int> tag_int;
+typedef boost::error_info<struct test_tag,int> tag_int;
struct
error1:
@@ -48,27 +48,65 @@
main()
{
using namespace boost;
+ try
{
error1 x;
BOOST_TEST(x.what()==std::string("error1"));
+ throw x;
+ }
+ catch(
+ std::exception & x )
+ {
std::string di=get_diagnostic_information(x);
BOOST_TEST(di.find("type:")!=std::string::npos);
BOOST_TEST(di.find("error1")!=std::string::npos);
}
+ catch(
+ ... )
+ {
+ BOOST_TEST(false);
+ }
+ try
{
error2 x; x << tag_int(42);
BOOST_TEST(x.what()==std::string("error2"));
+ throw x;
+ }
+ catch(
+ std::exception & x )
+ {
std::string di=get_diagnostic_information(x);
BOOST_TEST(di.find("type:")!=std::string::npos);
+#ifndef BOOST_NO_RTTI
BOOST_TEST(di.find("error2")!=std::string::npos);
+#endif
+ BOOST_TEST(di.find("test_tag")!=std::string::npos);
}
+ catch(
+ ... )
+ {
+ BOOST_TEST(false);
+ }
+ try
{
error3 x;
x << tag_int(1);
+ throw x;
+ }
+ catch(
+ boost::exception & x )
+ {
std::string w1 = x.diagnostic_information();
x << tag_int(2);
std::string w2 = x.diagnostic_information();
BOOST_TEST( w1!=w2 );
+ BOOST_TEST(w1.find("test_tag")!=std::string::npos);
+ BOOST_TEST(w2.find("test_tag")!=std::string::npos);
+ }
+ catch(
+ ... )
+ {
+ BOOST_TEST(false);
}
return boost::report_errors();
}
Modified: trunk/libs/exception/test/enable_error_info_test.cpp
==============================================================================
--- trunk/libs/exception/test/enable_error_info_test.cpp (original)
+++ trunk/libs/exception/test/enable_error_info_test.cpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -4,6 +4,7 @@
//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "helper1.hpp"
+#include <boost/exception/get_error_info.hpp>
#include <boost/exception/info.hpp>
#include <boost/exception/diagnostic_information.hpp>
#include <boost/detail/lightweight_test.hpp>
Modified: trunk/libs/exception/test/errno_test.cpp
==============================================================================
--- trunk/libs/exception/test/errno_test.cpp (original)
+++ trunk/libs/exception/test/errno_test.cpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -3,6 +3,7 @@
//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)
+#include <boost/exception/get_error_info.hpp>
#include <boost/exception/info.hpp>
#include <boost/detail/lightweight_test.hpp>
#include <errno.h>
Modified: trunk/libs/exception/test/error_info_test.cpp
==============================================================================
--- trunk/libs/exception/test/error_info_test.cpp (original)
+++ trunk/libs/exception/test/error_info_test.cpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -3,6 +3,7 @@
//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)
+#include <boost/exception/get_error_info.hpp>
#include <boost/exception/info_tuple.hpp>
#include <boost/detail/lightweight_test.hpp>
@@ -38,12 +39,20 @@
void
basic_test()
{
- test_exception x;
- x << test_1(1) << test_2(2u) << test_3(3.14159f);
- BOOST_TEST(*boost::get_error_info<test_1>(x)==1);
- BOOST_TEST(*boost::get_error_info<test_2>(x)==2u);
- BOOST_TEST(*boost::get_error_info<test_3>(x)==3.14159f);
- BOOST_TEST(!boost::get_error_info<test_4>(x));
+ try
+ {
+ test_exception x;
+ x << test_1(1) << test_2(2u) << test_3(3.14159f);
+ throw x;
+ }
+ catch(
+ test_exception & x )
+ {
+ BOOST_TEST(*boost::get_error_info<test_1>(x)==1);
+ BOOST_TEST(*boost::get_error_info<test_2>(x)==2u);
+ BOOST_TEST(*boost::get_error_info<test_3>(x)==3.14159f);
+ BOOST_TEST(!boost::get_error_info<test_4>(x));
+ }
}
void
@@ -58,8 +67,8 @@
catch(
test_exception & )
{
+ BOOST_TEST(!boost::get_error_info<test_4>(x));
}
- BOOST_TEST(!boost::get_error_info<test_4>(x));
}
void
@@ -107,7 +116,9 @@
catch(
boost::exception & x )
{
+#ifndef BOOST_NO_RTTI
BOOST_TEST( dynamic_cast<test_exception *>(&x) );
+#endif
BOOST_TEST( !boost::get_error_info<test_1>(x) );
}
catch(
@@ -124,7 +135,7 @@
catch(
test_exception & x )
{
- BOOST_TEST( dynamic_cast<boost::exception *>(&x) );
+ BOOST_TEST( boost::exception_detail::get_boost_exception(&x) );
}
catch(
... )
Added: trunk/libs/exception/test/get_error_info_hpp_test.cpp
==============================================================================
--- (empty file)
+++ trunk/libs/exception/test/get_error_info_hpp_test.cpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -0,0 +1,6 @@
+//Copyright (c) 2006-2008 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)
+
+#include <boost/exception/get_error_info.hpp>
Modified: trunk/libs/exception/test/throw_exception_test.cpp
==============================================================================
--- trunk/libs/exception/test/throw_exception_test.cpp (original)
+++ trunk/libs/exception/test/throw_exception_test.cpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -4,6 +4,7 @@
//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include "helper2.hpp"
+#include <boost/exception/get_error_info.hpp>
#include <boost/exception/info.hpp>
#include <boost/exception_ptr.hpp>
#include <boost/detail/lightweight_test.hpp>
Modified: trunk/libs/exception/test/unknown_exception_test.cpp
==============================================================================
--- trunk/libs/exception/test/unknown_exception_test.cpp (original)
+++ trunk/libs/exception/test/unknown_exception_test.cpp 2008-08-28 19:49:55 EDT (Thu, 28 Aug 2008)
@@ -4,6 +4,7 @@
//file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
#include <boost/exception_ptr.hpp>
+#include <boost/exception/get_error_info.hpp>
#include <boost/exception/info.hpp>
#include <boost/detail/lightweight_test.hpp>
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk