[Boost-commit] svn:boost r45627 - in trunk/boost: . test/impl

From: pdimov_at_[hidden]
Date: 2008-05-21 17:13:22

Author: pdimov
Date: 2008-05-21 17:13:22 EDT (Wed, 21 May 2008)
New Revision: 45627
URL: http://svn.boost.org/trac/boost/changeset/45627

Log:
Largely pointless Borland 5.5.1 changes. :-)
Text files modified: 
   trunk/boost/lexical_cast.hpp                |     8 ++++++++                                
   trunk/boost/test/impl/execution_monitor.ipp |     8 ++++++--                                
   2 files changed, 14 insertions(+), 2 deletions(-)

Modified: trunk/boost/lexical_cast.hpp
==============================================================================
--- trunk/boost/lexical_cast.hpp	(original)
+++ trunk/boost/lexical_cast.hpp	2008-05-21 17:13:22 EDT (Wed, 21 May 2008)
@@ -19,6 +19,7 @@
 #include <istream>
 #include <string>
 #include <typeinfo>
+#include <exception>
 #include <boost/config.hpp>
 #include <boost/limits.hpp>
 #include <boost/mpl/if.hpp>
@@ -28,6 +29,7 @@
 #include <boost/call_traits.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/detail/lcast_precision.hpp>
+#include <boost/detail/workaround.hpp>
 
 #ifndef BOOST_NO_STD_LOCALE
 #include <locale>
@@ -49,6 +51,12 @@
 {
     // exception used to indicate runtime lexical_cast failure
     class bad_lexical_cast : public std::bad_cast
+
+#if defined(__BORLANDC__) && BOOST_WORKAROUND( __BORLANDC__, < 0x560 )
+        // under bcc32 5.5.1 bad_cast doesn't derive from exception
+        , public std::exception
+#endif
+
     {
     public:
         bad_lexical_cast() :

Modified: trunk/boost/test/impl/execution_monitor.ipp
==============================================================================
--- trunk/boost/test/impl/execution_monitor.ipp	(original)
+++ trunk/boost/test/impl/execution_monitor.ipp	2008-05-21 17:13:22 EDT (Wed, 21 May 2008)
@@ -69,9 +69,13 @@
 #    include <eh.h>
 #  endif
 
-#  if defined(__BORLANDC__) || defined(__MWERKS__)
+#  if defined(__BORLANDC__) && __BORLANDC__ >= 0x560 || defined(__MWERKS__)
 #    include <stdint.h>
-#endif
+#  endif
+
+#  if defined(__BORLANDC__) && __BORLANDC__ < 0x560
+    typedef unsigned uintptr_t;
+#  endif
 
 #  if BOOST_WORKAROUND(_MSC_VER,  < 1300 ) || defined(UNDER_CE)
 typedef void* uintptr_t;