[Boost-commit] svn:boost r85783 - in branches/release/boost/exception: . detail

Subject: [Boost-commit] svn:boost r85783 - in branches/release/boost/exception: . detail
From: emil_at_[hidden]
Date: 2013-09-19 02:01:46

Author: emildotchevski
Date: 2013-09-19 02:01:46 EDT (Thu, 19 Sep 2013)
New Revision: 85783
URL: http://svn.boost.org/trac/boost/changeset/85783

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

Text files modified: 
   branches/release/boost/exception/detail/exception_ptr.hpp   |     8 ++++++--                                
   branches/release/boost/exception/detail/type_info.hpp       |    10 +++++-----                              
   branches/release/boost/exception/diagnostic_information.hpp |     8 ++++----                                
   3 files changed, 15 insertions(+), 11 deletions(-)

Modified: branches/release/boost/exception/detail/exception_ptr.hpp
==============================================================================
--- branches/release/boost/exception/detail/exception_ptr.hpp	Thu Sep 19 01:53:38 2013	(r85782)
+++ branches/release/boost/exception/detail/exception_ptr.hpp	2013-09-19 02:01:46 EDT (Thu, 19 Sep 2013)	(r85783)
@@ -21,7 +21,9 @@
 #include <boost/exception/diagnostic_information.hpp>
 #include <boost/exception/detail/type_info.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 <stdexcept>
 #include <new>
@@ -90,7 +92,7 @@
     std::string
     to_string( original_exception_type const & x )
         {
-        return units::detail::demangle(x.value()->name());
+        return /*units::detail::demangle*/(x.value()->name());
         }
 #endif
 
@@ -119,10 +121,12 @@
             {
             Exception ba;
             exception_detail::clone_impl<Exception> c(ba);
+#ifndef BOOST_EXCEPTION_DISABLE
             c <<
                 throw_function(BOOST_CURRENT_FUNCTION) <<
                 throw_file(__FILE__) <<
                 throw_line(__LINE__);
+#endif
             static exception_ptr ep(shared_ptr<exception_detail::clone_base const>(new exception_detail::clone_impl<Exception>(c)));
             return ep;
             }

Modified: branches/release/boost/exception/detail/type_info.hpp
==============================================================================
--- branches/release/boost/exception/detail/type_info.hpp	Thu Sep 19 01:53:38 2013	(r85782)
+++ branches/release/boost/exception/detail/type_info.hpp	2013-09-19 02:01:46 EDT (Thu, 19 Sep 2013)	(r85783)
@@ -15,9 +15,9 @@
 #include <boost/detail/sp_typeinfo.hpp>
 #include <boost/current_function.hpp>
 #include <boost/config.hpp>
-#ifndef BOOST_NO_TYPEID
-#include <boost/units/detail/utility.hpp>
-#endif
+//#ifndef BOOST_NO_TYPEID
+//#include <boost/units/detail/utility.hpp>
+//#endif
 #include <string>
 
 namespace
@@ -31,7 +31,7 @@
 #ifdef BOOST_NO_TYPEID
         return BOOST_CURRENT_FUNCTION;
 #else
-        return units::detail::demangle(typeid(T*).name());
+        return /*units::detail::demangle*/(typeid(T*).name());
 #endif
         }
 
@@ -43,7 +43,7 @@
 #ifdef BOOST_NO_TYPEID
         return BOOST_CURRENT_FUNCTION;
 #else
-        return units::detail::demangle(typeid(T).name());
+        return /*units::detail::demangle*/(typeid(T).name());
 #endif
         }
 

Modified: branches/release/boost/exception/diagnostic_information.hpp
==============================================================================
--- branches/release/boost/exception/diagnostic_information.hpp	Thu Sep 19 01:53:38 2013	(r85782)
+++ branches/release/boost/exception/diagnostic_information.hpp	2013-09-19 02:01:46 EDT (Thu, 19 Sep 2013)	(r85783)
@@ -16,9 +16,9 @@
 #include <boost/exception/get_error_info.hpp>
 #include <boost/exception/info.hpp>
 #include <boost/utility/enable_if.hpp>
-#ifndef BOOST_NO_RTTI
-#include <boost/units/detail/utility.hpp>
-#endif
+//#ifndef BOOST_NO_RTTI
+//#include <boost/units/detail/utility.hpp>
+//#endif
 #include <exception>
 #include <sstream>
 #include <string>
@@ -151,7 +151,7 @@
 #ifndef BOOST_NO_RTTI
             if ( verbose )
                 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 && verbose )
                 tmp << "std::exception::what: " << wh << '\n';