[Boost-commit] svn:boost r40203 - trunk/boost/test/impl

From: gennadiy.rozental_at_[hidden]
Date: 2007-10-20 01:38:58

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

Log:
borland port
Text files modified: 
   trunk/boost/test/impl/execution_monitor.ipp |    38 ++++++++++++++++++++++++++++++++------  
   1 files changed, 32 insertions(+), 6 deletions(-)

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-20 01:38:57 EDT (Sat, 20 Oct 2007)
@@ -56,20 +56,46 @@
 #  define BOOST_SEH_BASED_SIGNAL_HANDLING
 
 #  include <windows.h>
+
 #  if defined(__MWERKS__)
 #    include <eh.h>
-#    include <cstdint>
-
-using std::uintptr_t;
 #  endif
 
-#  if BOOST_WORKAROUND(BOOST_MSVC,  < 1300 )
+#  if defined(__BORLANDC__) || defined(__MWERKS__)
+#    include <stdint.h>
+#endif
+
+#  if BOOST_WORKAROUND(BOOST_MSVC,  < 1300 ) 
 typedef void* uintptr_t;
 #  endif
 
 // for the FP control routines
 #include <float.h>
 
+#ifndef EM_INVALID
+#define EM_INVALID _EM_INVALID
+#endif
+
+#ifndef EM_DENORMAL
+#define EM_DENORMAL _EM_DENORMAL
+#endif
+
+#ifndef EM_ZERODIVIDE
+#define EM_ZERODIVIDE _EM_ZERODIVIDE
+#endif
+
+#ifndef EM_OVERFLOW
+#define EM_OVERFLOW _EM_OVERFLOW
+#endif
+
+#ifndef EM_UNDERFLOW
+#define EM_UNDERFLOW _EM_UNDERFLOW
+#endif
+
+#ifndef MCW_EM
+#define MCW_EM _MCW_EM
+#endif
+
 #  if !defined(NDEBUG) && defined(_MSC_VER)
 #    define BOOST_TEST_USE_DEBUG_MS_CRT
 #    include <crtdbg.h>
@@ -900,7 +926,7 @@
 
     int cw = ::_controlfp( 0, 0 );
 
-    int exceptions_mask = _EM_INVALID|_EM_DENORMAL|_EM_ZERODIVIDE|_EM_OVERFLOW|_EM_UNDERFLOW;
+    int exceptions_mask = EM_INVALID|EM_DENORMAL|EM_ZERODIVIDE|EM_OVERFLOW|EM_UNDERFLOW;
 
     if( on_off )
         cw &= ~exceptions_mask; // Set the exception masks on, turn exceptions off
@@ -911,7 +937,7 @@
         _clearfp();
         
     // Set the control word
-    ::_controlfp( cw, _MCW_EM );
+    ::_controlfp( cw, MCW_EM );
 }
 
 //____________________________________________________________________________//