Release 1.46.1

[SVN r69890]
Revert r69620.
2011-03-12 15:41:16 +00:00 · 2011-03-10 07:34:15 +00:00 · 2011-03-07 07:45:38 +00:00 · 2010-12-09 06:40:19 +00:00 · 2010-12-09 06:19:56 +00:00
2 changed files with 2 additions and 2 deletions
--- a/include/boost/exception/diagnostic_information.hpp
+++ b/include/boost/exception/diagnostic_information.hpp
@ -137,7 +137,7 @@ boost
                }
 #ifndef BOOST_NO_RTTI
            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
            if( with_what && se )
                tmp << "std::exception::what: " << wh << '\n';
--- a/include/boost/throw_exception.hpp
+++ b/include/boost/throw_exception.hpp
@ -79,7 +79,7 @@ template<class E> BOOST_ATTRIBUTE_NORETURN inline void throw_exception( E const
                set_info(
                    set_info(
                        set_info(
-                            enable_error_info(x),
+                            boost::enable_error_info(x),
                            throw_function(current_function)),
                        throw_file(file)),
                    throw_line(line)));
Author	SHA1	Message	Date
Beman Dawes	02875b4fbd	Release 1.46.1 [SVN r69890]	2011-03-12 15:41:16 +00:00
Daniel James	2a2cf697b1	Revert r69620. It's breaking the tests and probably isn't appropriate for a bug fix release. [SVN r69816]	2011-03-10 07:34:15 +00:00
Emil Dotchevski	b41047174d	Committing changes merged from trunk, most notably optional non-intrusive exception_ptr support for MSVC. [SVN r69620]	2011-03-07 07:45:38 +00:00
Emil Dotchevski	41efaba6b8	Ticket #4344 [SVN r67128]	2010-12-09 06:40:19 +00:00
Emil Dotchevski	feadd7e878	Ticket #4968 [SVN r67127]	2010-12-09 06:19:56 +00:00