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

From: emil_at_[hidden]
Date: 2008-05-13 15:59:49

Author: emildotchevski
Date: 2008-05-13 15:59:48 EDT (Tue, 13 May 2008)
New Revision: 45339
URL: http://svn.boost.org/trac/boost/changeset/45339

Log:
enable_error_info.hpp hacked to support Borland 0x582
Text files modified: 
   trunk/boost/exception/enable_error_info.hpp |    16 ++++++++++++----                        
   1 files changed, 12 insertions(+), 4 deletions(-)

Modified: trunk/boost/exception/enable_error_info.hpp
==============================================================================
--- trunk/boost/exception/enable_error_info.hpp	(original)
+++ trunk/boost/exception/enable_error_info.hpp	2008-05-13 15:59:48 EDT (Tue, 13 May 2008)
@@ -8,6 +8,7 @@
 
 #include <boost/exception/exception.hpp>
 #include <boost/detail/workaround.hpp>
+#include <boost/config.hpp>   // For BOOST_STATIC_CONSTANT.
 
 namespace
 boost
@@ -55,12 +56,12 @@
             typedef error_info_injector<T> type;
             };
 
- #if BOOST_WORKAROUND(__BORLANDC__,BOOST_TESTED_AT(0x582))
+#if BOOST_WORKAROUND(__BORLANDC__,BOOST_TESTED_AT(0x582))
         template <class T>
         struct
         sizeof_dispatch
             {
-            enum e { value=sizeof(dispatch((T*)0)) };
+            BOOST_STATIC_CONSTANT(int, value = sizeof(dispatch((T*)0)) );
             };
 
         template <class T>
@@ -80,10 +81,17 @@
         }
 
     template <class T>
-    typename exception_detail::enable_error_info_return_type<T>::type
+#if !BOOST_WORKAROUND(__BORLANDC__,BOOST_TESTED_AT(0x582))
+    typename
+#endif
+    exception_detail::enable_error_info_return_type<T>::type
     enable_error_info( T const & x )
         {
-        return typename exception_detail::enable_error_info_return_type<T>::type(x);
+        return
+#if !BOOST_WORKAROUND(__BORLANDC__,BOOST_TESTED_AT(0x582))
+        typename
+#endif
+        exception_detail::enable_error_info_return_type<T>::type(x);
         }
     }