[Boost-commit] svn:boost r62779 - in trunk: boost/test/detail boost/test/impl libs/test/test

Subject: [Boost-commit] svn:boost r62779 - in trunk: boost/test/detail boost/test/impl libs/test/test
From: steven_at_[hidden]
Date: 2010-06-10 20:51:37

Author: steven_watanabe
Date: 2010-06-10 20:51:35 EDT (Thu, 10 Jun 2010)
New Revision: 62779
URL: http://svn.boost.org/trac/boost/changeset/62779

Log:
Fixes for como
Text files modified: 
   trunk/boost/test/detail/config.hpp           |     6 ++++++                                  
   trunk/boost/test/impl/execution_monitor.ipp  |     5 ++++-                                   
   trunk/libs/test/test/test_fp_comparisons.cpp |    10 +++++-----                              
   3 files changed, 15 insertions(+), 6 deletions(-)

Modified: trunk/boost/test/detail/config.hpp
==============================================================================
--- trunk/boost/test/detail/config.hpp	(original)
+++ trunk/boost/test/detail/config.hpp	2010-06-10 20:51:35 EDT (Thu, 10 Jun 2010)
@@ -25,6 +25,12 @@
 #  define BOOST_SEH_BASED_SIGNAL_HANDLING
 #endif
 
+#if defined(__COMO__) && defined(_MSC_VER)
+// eh.h uses type_info without declaring it.
+class type_info;
+#  define BOOST_SEH_BASED_SIGNAL_HANDLING
+#endif
+
 //____________________________________________________________________________//
 
 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)) || \

Modified: trunk/boost/test/impl/execution_monitor.ipp
==============================================================================
--- trunk/boost/test/impl/execution_monitor.ipp	(original)
+++ trunk/boost/test/impl/execution_monitor.ipp	2010-06-10 20:51:35 EDT (Thu, 10 Jun 2010)
@@ -96,7 +96,10 @@
 #    define BOOST_TEST_CRT_SET_HOOK(H)  (void*)(H)
 #  endif
 
-#  if !BOOST_WORKAROUND(_MSC_VER,  >= 1400 ) || defined(UNDER_CE)
+// como always sets _MSC_VER to 1310, regardless of the
+// actual underlying msvc version.
+#  if (!BOOST_WORKAROUND(_MSC_VER,  >= 1400 ) && \
+      !defined(__COMO__)) || defined(UNDER_CE)
 
 typedef void* _invalid_parameter_handler;
 

Modified: trunk/libs/test/test/test_fp_comparisons.cpp
==============================================================================
--- trunk/libs/test/test/test_fp_comparisons.cpp	(original)
+++ trunk/libs/test/test/test_fp_comparisons.cpp	2010-06-10 20:51:35 EDT (Thu, 10 Jun 2010)
@@ -52,7 +52,7 @@
                                             \
     BOOST_CHECK_PREDICATE(                  \
         bind(not_func, bind(check_is_close, _1, _2, _3)),  \
-        (fp1)(fp2)(fpc::percent_tolerance( epsilon )) ); \
+        (fp1)(fp2)(::fpc::percent_tolerance( epsilon )) ); \
 /**/
 
     FPT fp1, fp2, epsilon;
@@ -162,20 +162,20 @@
     double fp2     = 1.00000002;
     double epsilon = 1e-6;
 
-    fpc::close_at_tolerance<double> pred( fpc::percent_tolerance( epsilon ), fpc::FPC_WEAK );
+    ::fpc::close_at_tolerance<double> pred( ::fpc::percent_tolerance( epsilon ), ::fpc::FPC_WEAK );
     BOOST_CHECK_PREDICATE( pred, (fp1)(fp2) );
 
     BOOST_CHECK_PREDICATE( bind(not_func, bind(check_is_close, _1, _2, _3)), 
-                           (fp1)(fp2)(fpc::percent_tolerance( epsilon )) );
+                           (fp1)(fp2)( ::fpc::percent_tolerance( epsilon )) );
 
     fp1     = 1.23456e-10;
     fp2     = 1.23457e-10;
     epsilon = 8.1e-4;
 
-    BOOST_CHECK_PREDICATE( fpc::close_at_tolerance<double>( fpc::percent_tolerance( epsilon ), fpc::FPC_WEAK ), (fp1)(fp2) );
+    BOOST_CHECK_PREDICATE( ::fpc::close_at_tolerance<double>( ::fpc::percent_tolerance( epsilon ), ::fpc::FPC_WEAK ), (fp1)(fp2) );
     BOOST_CHECK_PREDICATE( 
         bind(not_func, 
-             bind(fpc::close_at_tolerance<double>( fpc::percent_tolerance( epsilon ) ), _1, _2)), (fp1)(fp2) );
+             bind( ::fpc::close_at_tolerance<double>( ::fpc::percent_tolerance( epsilon ) ), _1, _2)), (fp1)(fp2) );
 }
 
 //____________________________________________________________________________//