[Boost-commit] svn:boost r48543 - trunk/boost/exception

From: emil_at_[hidden]
Date: 2008-09-02 14:44:05

Author: emildotchevski
Date: 2008-09-02 14:44:05 EDT (Tue, 02 Sep 2008)
New Revision: 48543
URL: http://svn.boost.org/trac/boost/changeset/48543

Log:
minor diagnostic_information fix.
Text files modified: 
   trunk/boost/exception/diagnostic_information.hpp |    30 +++++-------------------------          
   trunk/boost/exception/exception.hpp              |    14 +++++++-------                          
   trunk/boost/exception/info.hpp                   |     6 +++---                                  
   3 files changed, 15 insertions(+), 35 deletions(-)

Modified: trunk/boost/exception/diagnostic_information.hpp
==============================================================================
--- trunk/boost/exception/diagnostic_information.hpp	(original)
+++ trunk/boost/exception/diagnostic_information.hpp	2008-09-02 14:44:05 EDT (Tue, 02 Sep 2008)
@@ -30,28 +30,6 @@
                     }
             return 0;
             }
-
-        template <class T>
-        std::string
-        std_exception_diagnostic_information( std::exception const * x, T const & )
-            {
-            if( char const * s=x->what() )
-                if( *s )
-                    return std::string("\nstd::exception::what(): ")+s;
-            return std::string();
-            }
-
-        template <class T>
-        std::string
-        std_exception_diagnostic_information( void const *, T const & e )
-            {
-#ifndef BOOST_NO_RTTI
-            if( std::exception const * x=dynamic_cast<std::exception const *>(&e) )
-                return std_exception_diagnostic_information(x,e);
-            else
-#endif
-                return std::string();
-            }
         }
 
     inline
@@ -61,8 +39,10 @@
         std::ostringstream tmp;
         tmp <<
             "boost::exception diagnostic information:"
-#if !defined(BOOST_NO_RTTI) && !defined(BOOST_NO_TYPEID)
-            "\nDynamic exception type: " << BOOST_EXCEPTION_DYNAMIC_TYPEID(x).name()
+#ifndef BOOST_NO_RTTI
+            "\nDynamic exception type: " << BOOST_EXCEPTION_DYNAMIC_TYPEID(x).name();
+        if( std::exception const * e=dynamic_cast<std::exception const *>(&x) )
+            tmp << "\nstd::exception::what: " << e->what()
 #endif
             ;
         if( boost::shared_ptr<char const * const> f=get_error_info<throw_function>(x) )
@@ -71,7 +51,7 @@
             tmp << "\nThrow file name: " << *f;
         if( boost::shared_ptr<int const> l=get_error_info<throw_line>(x) )
             tmp << "\nThrow file line: " << *l;
-		if( char const * s=exception_detail::get_diagnostic_information(x) )
+        if( char const * s=exception_detail::get_diagnostic_information(x) )
             if( *s )
                 tmp << "\n" << s;
         return tmp.str();

Modified: trunk/boost/exception/exception.hpp
==============================================================================
--- trunk/boost/exception/exception.hpp	(original)
+++ trunk/boost/exception/exception.hpp	2008-09-02 14:44:05 EDT (Tue, 02 Sep 2008)
@@ -160,13 +160,13 @@
         template <class>
         struct get_info;
 
-		template <>
+        template <>
         struct get_info<throw_function>;
 
-		template <>
+        template <>
         struct get_info<throw_file>;
 
-		template <>
+        template <>
         struct get_info<throw_line>;
 
         char const * get_diagnostic_information( exception const & );
@@ -313,10 +313,10 @@
             virtual clone_base const * clone() const = 0;
             virtual void rethrow() const = 0;
 
-			virtual
-			~clone_base() throw()
-				{
-				}
+            virtual
+            ~clone_base() throw()
+                {
+                }
             };
 
         inline

Modified: trunk/boost/exception/info.hpp
==============================================================================
--- trunk/boost/exception/info.hpp	(original)
+++ trunk/boost/exception/info.hpp	2008-09-02 14:44:05 EDT (Tue, 02 Sep 2008)
@@ -29,9 +29,9 @@
             {
             }
 
-		~error_info() throw()
-			{
-			}
+        ~error_info() throw()
+            {
+            }
 
         value_type const &
         value() const