[Boost-commit] svn:boost r69619 - in trunk: boost/exception libs/exception/test

Subject: [Boost-commit] svn:boost r69619 - in trunk: boost/exception libs/exception/test
From: emil_at_[hidden]
Date: 2011-03-07 02:39:57

Author: emildotchevski
Date: 2011-03-07 02:39:50 EST (Mon, 07 Mar 2011)
New Revision: 69619
URL: http://svn.boost.org/trac/boost/changeset/69619

Log:
Incorrect check in cloning_test fixed, and workaround for Metrowerks.
Text files modified: 
   trunk/boost/exception/exception.hpp        |     2 +-                                      
   trunk/libs/exception/test/cloning_test.cpp |     4 ++--                                    
   2 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/boost/exception/exception.hpp
==============================================================================
--- trunk/boost/exception/exception.hpp	(original)
+++ trunk/boost/exception/exception.hpp	2011-03-07 02:39:50 EST (Mon, 07 Mar 2011)
@@ -344,7 +344,7 @@
         struct
         enable_error_info_return_type
             {
-            typedef typename enable_error_info_helper<T,sizeof(exception_detail::dispatch_boost_exception((T*)0))>::type type;
+            typedef typename enable_error_info_helper<T,sizeof(exception_detail::dispatch_boost_exception(static_cast<T *>(0)))>::type type;
             };
         }
 

Modified: trunk/libs/exception/test/cloning_test.cpp
==============================================================================
--- trunk/libs/exception/test/cloning_test.cpp	(original)
+++ trunk/libs/exception/test/cloning_test.cpp	2011-03-07 02:39:50 EST (Mon, 07 Mar 2011)
@@ -180,7 +180,7 @@
         catch(
         T & x )
             {
-            BOOST_TEST(std::string("what")==x.what());
+            BOOST_TEST(std::string(x.what()).find("what")!=std::string::npos);
             boost::exception_ptr p = boost::current_exception();
             BOOST_TEST(!(p==boost::exception_ptr()));
             BOOST_TEST(p!=boost::exception_ptr());
@@ -193,7 +193,7 @@
             catch(
             T & x )
                 {
-                BOOST_TEST(std::string("what")==x.what());
+                BOOST_TEST(std::string(x.what()).find("what")!=std::string::npos);
                 }
             catch(
             ... )