From 4dc5b8d088ee5130a230856aef2026d53b964a7a Mon Sep 17 00:00:00 2001
From: Emil Dotchevski <emil@revergestudios.com>
Date: Wed, 8 Oct 2008 23:04:36 +0000
Subject: [PATCH] merged borland 6+ support from trunk.

[SVN r49190]
---
 include/boost/exception/exception.hpp | 3 ++-
 include/boost/throw_exception.hpp     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/boost/exception/exception.hpp b/include/boost/exception/exception.hpp
index 3d5383d..53e6ed0 100644
--- a/include/boost/exception/exception.hpp
+++ b/include/boost/exception/exception.hpp
@@ -313,7 +313,8 @@ boost
     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);
+        typedef typename exception_detail::enable_error_info_return_type<T>::type rt;
+        return rt(x);
         }
 
     ////////////////////////////////////////////////////////////////////////
diff --git a/include/boost/throw_exception.hpp b/include/boost/throw_exception.hpp
index 5d00854..69cdad0 100644
--- a/include/boost/throw_exception.hpp
+++ b/include/boost/throw_exception.hpp
@@ -24,7 +24,7 @@
 #include <boost/detail/workaround.hpp>
 #include <exception>
 
-#if !defined( BOOST_EXCEPTION_DISABLE ) && defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, <= 0x593 )
+#if !defined( BOOST_EXCEPTION_DISABLE ) && defined( __BORLANDC__ ) && BOOST_WORKAROUND( __BORLANDC__, BOOST_TESTED_AT(0x593) )
 # define BOOST_EXCEPTION_DISABLE
 #endif