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

From: gennadiy.rozental_at_[hidden]
Date: 2007-10-24 20:01:39

Author: rogeeff
Date: 2007-10-24 20:01:38 EDT (Wed, 24 Oct 2007)
New Revision: 40447
URL: http://svn.boost.org/trac/boost/changeset/40447

Log:
avoid msvc 8.0 warning 
more win CE workaround
Text files modified: 
   trunk/boost/test/detail/config.hpp          |    42 --------------------------------------- 
   trunk/boost/test/impl/execution_monitor.ipp |    21 ++++++++++++++-----                     
   2 files changed, 16 insertions(+), 47 deletions(-)

Modified: trunk/boost/test/detail/config.hpp
==============================================================================
--- trunk/boost/test/detail/config.hpp	(original)
+++ trunk/boost/test/detail/config.hpp	2007-10-24 20:01:38 EDT (Wed, 24 Oct 2007)
@@ -62,7 +62,7 @@
 
 //____________________________________________________________________________//
 
-#ifdef __GNUC__
+#if defined(__GNUC__) || BOOST_WORKAROUND(BOOST_MSVC, == 1400)
 #define BOOST_TEST_PROTECTED_VIRTUAL virtual
 #else
 #define BOOST_TEST_PROTECTED_VIRTUAL
@@ -103,44 +103,4 @@
 #define BOOST_TEST_MAIN BOOST_TEST_MODULE
 #endif
 
-// ***************************************************************************
-//  Revision History :
-//  
-//  $Log$
-//  Revision 1.5  2006/02/06 10:03:54  rogeeff
-//  BOOST_TEST_MODULE - master test suite name
-//
-//  Revision 1.4  2006/01/15 06:17:18  rogeeff
-//  make config working properly for non-windows dll
-//
-//  Revision 1.3  2005/12/14 04:56:31  rogeeff
-//  dll support introduced
-//
-//  Revision 1.2  2005/07/13 21:49:46  danieljames
-//  Boost.Test workarounds for Digital Mars bugs.
-//
-//  Revision 1.1  2005/02/20 08:27:06  rogeeff
-//  This a major update for Boost.Test framework. See release docs for complete list of fixes/updates
-//
-//  Revision 1.28  2005/02/01 06:40:07  rogeeff
-//  copyright update
-//  old log entries removed
-//  minor stilistic changes
-//  depricated tools removed
-//
-//  Revision 1.27  2005/01/31 07:50:06  rogeeff
-//  cdecl portability fix
-//
-//  Revision 1.26  2005/01/30 01:48:24  rogeeff
-//  BOOST_TEST_STRINGIZE introduced
-//  counter type renamed
-//
-//  Revision 1.25  2005/01/22 19:22:12  rogeeff
-//  implementation moved into headers section to eliminate dependency of included/minimal component on src directory
-//
-//  Revision 1.24  2005/01/21 07:33:20  rogeeff
-//  BOOST_TEST_SUPPORT_TIMEOUT flag introduced to be used by used to switch code by timeout support
-//
-// ***************************************************************************
-
 #endif // BOOST_TEST_CONFIG_HPP_071894GER

Modified: trunk/boost/test/impl/execution_monitor.ipp
==============================================================================
--- trunk/boost/test/impl/execution_monitor.ipp	(original)
+++ trunk/boost/test/impl/execution_monitor.ipp	2007-10-24 20:01:38 EDT (Wed, 24 Oct 2007)
@@ -65,7 +65,7 @@
 #    include <stdint.h>
 #endif
 
-#  if BOOST_WORKAROUND(_MSC_VER,  < 1300 ) 
+#  if BOOST_WORKAROUND(_MSC_VER,  < 1300 ) || defined(UNDER_CE)
 typedef void* uintptr_t;
 #  endif
 
@@ -96,12 +96,12 @@
 #define MCW_EM _MCW_EM
 #endif
 
-#  if !defined(NDEBUG) && defined(_MSC_VER)
+#  if !defined(NDEBUG) && defined(_MSC_VER) && !defined(UNDER_CE)
 #    define BOOST_TEST_USE_DEBUG_MS_CRT
 #    include <crtdbg.h>
 #  endif
 
-#  if !BOOST_WORKAROUND(_MSC_VER,  >= 1400 )
+#  if !BOOST_WORKAROUND(_MSC_VER,  >= 1400 ) || defined(UNDER_CE)
 
 typedef void* _invalid_parameter_handler;
 
@@ -113,7 +113,7 @@
 
 #  endif
 
-#  if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x0564))
+#  if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x0564)) || defined(UNDER_CE)
 
 namespace { void _set_se_translator( void* ) {} }
 
@@ -145,7 +145,9 @@
 
 #endif
 
+#ifndef UNDER_CE
 #include <errno.h>
+#endif
 
 #include <boost/test/detail/suppress_warnings.hpp>
 
@@ -977,10 +979,12 @@
     }
 
     detail::system_signal_exception SSE( this );
+    
+    int ret_val = 0;
 
     __try {
         __try {
-            return detail::do_invoke( m_custom_translators , F );
+            ret_val = detail::do_invoke( m_custom_translators , F );
         }
         __except( SSE( GetExceptionCode(), GetExceptionInformation() ) ) {
             throw SSE;
@@ -995,7 +999,7 @@
         }
     }
 
-    return 0;
+    return ret_val;
 }
 
 //____________________________________________________________________________//
@@ -1103,9 +1107,14 @@
 // ************************************************************************** //
 
 system_error::system_error()
+#ifdef UNDER_CE
+: p_errno( GetLastError() )
+#else
 : p_errno( errno )
+#endif
 {}
 
+
 //____________________________________________________________________________//
 
 } // namespace boost