Merge remote-tracking branch 'origin/develop'

This commit is contained in:
Emil Dotchevski
2014-08-29 17:51:11 -07:00
3 changed files with 15 additions and 17 deletions

View File

@@ -21,9 +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>
//#ifndef BOOST_NO_RTTI #ifndef BOOST_NO_RTTI
//#include <boost/units/detail/utility.hpp> #include <boost/core/demangle.hpp>
//#endif #endif
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <stdexcept> #include <stdexcept>
#include <new> #include <new>
@@ -92,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 core::demangle(x.value()->name());
} }
#endif #endif

View File

@@ -12,12 +12,10 @@
#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>
//#ifndef BOOST_NO_TYPEID
//#include <boost/units/detail/utility.hpp>
//#endif
#include <string> #include <string>
namespace namespace
@@ -31,7 +29,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 core::demangle(typeid(T*).name());
#endif #endif
} }
@@ -43,7 +41,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 core::demangle(typeid(T).name());
#endif #endif
} }
@@ -53,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)
{ {
} }
@@ -71,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))

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/core/demangle.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'; 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';