feedc0de/boost_exception
1
0
Fork 0
forked from boostorg/exception
Code Pull Requests Activity

Disabled demangling to break the dependency Exception -> Units -> Algorithms -> Range -> Concepts.

Browse Source 
[SVN r85783]
This commit is contained in:
Emil Dotchevski
2013-09-19 06:01:46 +00:00
parent 107f265ead
commit fb463f9faf
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,9 @@
#include <boost/exception/diagnostic_information.hpp> #include <boost/exception/diagnostic_information.hpp>
#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>
#include <boost/units/detail/utility.hpp> //#ifndef BOOST_NO_RTTI
//#include <boost/units/detail/utility.hpp>
//#endif
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <stdexcept> #include <stdexcept>
#include <new> #include <new>
@ -90,7 +92,7 @@ boost
std::string std::string
to_string( original_exception_type const & x ) to_string( original_exception_type const & x )
{ {
return units::detail::demangle(x.value()->name()); return /*units::detail::demangle*/(x.value()->name());
} }
#endif #endif
@ -119,10 +121,12 @@ boost
{ {
Exception ba; Exception ba;
exception_detail::clone_impl<Exception> c(ba); exception_detail::clone_impl<Exception> c(ba);
#ifndef BOOST_EXCEPTION_DISABLE
c << c <<
throw_function(BOOST_CURRENT_FUNCTION) << throw_function(BOOST_CURRENT_FUNCTION) <<
throw_file(__FILE__) << throw_file(__FILE__) <<
throw_line(__LINE__); throw_line(__LINE__);
#endif
static exception_ptr ep(shared_ptr<exception_detail::clone_base const>(new exception_detail::clone_impl<Exception>(c))); static exception_ptr ep(shared_ptr<exception_detail::clone_base const>(new exception_detail::clone_impl<Exception>(c)));
return ep; return ep;
} }

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

@ -15,9 +15,9 @@
#include <boost/detail/sp_typeinfo.hpp> #include <boost/detail/sp_typeinfo.hpp>
#include <boost/current_function.hpp> #include <boost/current_function.hpp>
#include <boost/config.hpp> #include <boost/config.hpp>
#ifndef BOOST_NO_TYPEID //#ifndef BOOST_NO_TYPEID
#include <boost/units/detail/utility.hpp> //#include <boost/units/detail/utility.hpp>
#endif //#endif
#include <string> #include <string>
namespace namespace
@ -31,7 +31,7 @@ boost
#ifdef BOOST_NO_TYPEID #ifdef BOOST_NO_TYPEID
return BOOST_CURRENT_FUNCTION; return BOOST_CURRENT_FUNCTION;
#else #else
return units::detail::demangle(typeid(T*).name()); return /*units::detail::demangle*/(typeid(T*).name());
#endif #endif
} }
@ -43,7 +43,7 @@ boost
#ifdef BOOST_NO_TYPEID #ifdef BOOST_NO_TYPEID
return BOOST_CURRENT_FUNCTION; return BOOST_CURRENT_FUNCTION;
#else #else
return units::detail::demangle(typeid(T).name()); return /*units::detail::demangle*/(typeid(T).name());
#endif #endif
} }

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

@ -16,9 +16,9 @@
#include <boost/exception/get_error_info.hpp> #include <boost/exception/get_error_info.hpp>
#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/units/detail/utility.hpp> //#include <boost/units/detail/utility.hpp>
#endif //#endif
#include <exception> #include <exception>
#include <sstream> #include <sstream>
#include <string> #include <string>
@ -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: ") <<
units::detail::demangle((be?(BOOST_EXCEPTION_DYNAMIC_TYPEID(*be)):(BOOST_EXCEPTION_DYNAMIC_TYPEID(*se))).type_->name()) << '\n'; /*units::detail::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';