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

Port to Boost.Core demangle() and typeinfo.

Browse Source
This commit is contained in:
Andrey Semashev
2014-06-11 22:02:59 +04:00
parent 8931eb2e0d
commit 5dea76a301
3 changed files with 11 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@
#include <boost/exception/detail/type_info.hpp> #include <boost/exception/detail/type_info.hpp>
#include <boost/exception/detail/clone_current_exception.hpp> #include <boost/exception/detail/clone_current_exception.hpp>
#ifndef BOOST_NO_RTTI #ifndef BOOST_NO_RTTI
#include <boost/exception/detail/type_info.hpp> // exception_detail::demangle() #include <boost/core/demangle.hpp>
#endif #endif
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <stdexcept> #include <stdexcept>
@ -92,7 +92,7 @@ boost
std::string std::string
to_string( original_exception_type const & x ) to_string( original_exception_type const & x )
{ {
return exception_detail::demangle(x.value()->name()); return core::demangle(x.value()->name());
} }
#endif #endif

45
include/boost/exception/detail/type_info.hpp
View File

@ -12,46 +12,15 @@
#pragma warning(push,1) #pragma warning(push,1)
#endif #endif
#include <boost/detail/sp_typeinfo.hpp> #include <boost/core/typeinfo.hpp>
#include <boost/core/demangle.hpp>
#include <boost/current_function.hpp> #include <boost/current_function.hpp>
#include <boost/config.hpp> #include <boost/config.hpp>
#include <string> #include <string>
#if defined(__GLIBCXX__) || defined(__GLIBCPP__)
#include <cxxabi.h>
#include <stdlib.h>
#include <stddef.h>
#define BOOST_EXCEPTION_HAS_CXXABI_H
#endif
namespace namespace
boost boost
{ {
namespace
exception_detail
{
inline
std::string
demangle(const char* name)
{
#ifdef BOOST_EXCEPTION_HAS_CXXABI_H
struct auto_free
{
explicit auto_free(char* ptr) : p(ptr) {}
~auto_free() { free(p); }
char* p;
};
int status = 0;
size_t size = 0;
auto_free demangled(abi::__cxa_demangle(name, NULL, &size, &status));
if (demangled.p)
return demangled.p;
#endif
return name;
}
}
template <class T> template <class T>
inline inline
std::string std::string
@ -60,7 +29,7 @@ boost
#ifdef BOOST_NO_TYPEID #ifdef BOOST_NO_TYPEID
return BOOST_CURRENT_FUNCTION; return BOOST_CURRENT_FUNCTION;
#else #else
return exception_detail::demangle(typeid(T*).name()); return core::demangle(typeid(T*).name());
#endif #endif
} }
@ -72,7 +41,7 @@ boost
#ifdef BOOST_NO_TYPEID #ifdef BOOST_NO_TYPEID
return BOOST_CURRENT_FUNCTION; return BOOST_CURRENT_FUNCTION;
#else #else
return exception_detail::demangle(typeid(T).name()); return core::demangle(typeid(T).name());
#endif #endif
} }
@ -82,10 +51,10 @@ boost
struct struct
type_info_ type_info_
{ {
detail::sp_typeinfo const * type_; core::typeinfo const * type_;
explicit explicit
type_info_( detail::sp_typeinfo const & type ): type_info_( core::typeinfo const & type ):
type_(&type) type_(&type)
{ {
} }
@ -100,7 +69,7 @@ boost
} }
} }
#define BOOST_EXCEPTION_STATIC_TYPEID(T) ::boost::exception_detail::type_info_(BOOST_SP_TYPEID(T)) #define BOOST_EXCEPTION_STATIC_TYPEID(T) ::boost::exception_detail::type_info_(BOOST_CORE_TYPEID(T))
#ifndef BOOST_NO_RTTI #ifndef BOOST_NO_RTTI
#define BOOST_EXCEPTION_DYNAMIC_TYPEID(x) ::boost::exception_detail::type_info_(typeid(x)) #define BOOST_EXCEPTION_DYNAMIC_TYPEID(x) ::boost::exception_detail::type_info_(typeid(x))

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

@ -17,7 +17,7 @@
#include <boost/exception/info.hpp> #include <boost/exception/info.hpp>
#include <boost/utility/enable_if.hpp> #include <boost/utility/enable_if.hpp>
#ifndef BOOST_NO_RTTI #ifndef BOOST_NO_RTTI
#include <boost/exception/detail/type_info.hpp> // exception_detail::demangle() #include <boost/core/demangle.hpp>
#endif #endif
#include <exception> #include <exception>
#include <sstream> #include <sstream>
@ -151,7 +151,7 @@ boost
#ifndef BOOST_NO_RTTI #ifndef BOOST_NO_RTTI
if ( verbose ) if ( verbose )
tmp << std::string("Dynamic exception type: ") << tmp << std::string("Dynamic exception type: ") <<
exception_detail::demangle((be?(BOOST_EXCEPTION_DYNAMIC_TYPEID(*be)):(BOOST_EXCEPTION_DYNAMIC_TYPEID(*se))).type_->name()) << '\n'; core::demangle((be?(BOOST_EXCEPTION_DYNAMIC_TYPEID(*be)):(BOOST_EXCEPTION_DYNAMIC_TYPEID(*se))).type_->name()) << '\n';
#endif #endif
if( with_what && se && verbose ) if( with_what && se && verbose )
tmp << "std::exception::what: " << wh << '\n'; tmp << "std::exception::what: " << wh << '\n';