From: gennadiy.rozental_at_[hidden]
Date: 2008-07-06 22:27:33
Author: rogeeff
Date: 2008-07-06 22:27:32 EDT (Sun, 06 Jul 2008)
New Revision: 47156
URL: http://svn.boost.org/trac/boost/changeset/47156
Log:
Suppress some warnings. Fixes #1495
Text files modified:
trunk/boost/test/detail/enable_warnings.hpp | 1 +
trunk/boost/test/detail/suppress_warnings.hpp | 1 +
trunk/boost/test/impl/debug.ipp | 15 ++++++++++-----
trunk/boost/test/impl/execution_monitor.ipp | 2 +-
4 files changed, 13 insertions(+), 6 deletions(-)
Modified: trunk/boost/test/detail/enable_warnings.hpp
==============================================================================
--- trunk/boost/test/detail/enable_warnings.hpp (original)
+++ trunk/boost/test/detail/enable_warnings.hpp 2008-07-06 22:27:32 EDT (Sun, 06 Jul 2008)
@@ -23,5 +23,6 @@
# pragma warning(default: 4127) // conditional expression is constant
# pragma warning(default: 4290) // C++ exception specification ignored except to ...
# pragma warning(default: 4180) // qualifier applied to function type has no meaning; ignored
+# pragma warning(default: 4275) // non dll-interface class ... used as base for dll-interface class ...
# pragma warning(pop)
#endif
Modified: trunk/boost/test/detail/suppress_warnings.hpp
==============================================================================
--- trunk/boost/test/detail/suppress_warnings.hpp (original)
+++ trunk/boost/test/detail/suppress_warnings.hpp 2008-07-06 22:27:32 EDT (Sun, 06 Jul 2008)
@@ -24,5 +24,6 @@
# pragma warning(disable: 4127) // conditional expression is constant
# pragma warning(disable: 4290) // C++ exception specification ignored except to ...
# pragma warning(disable: 4180) // qualifier applied to function type has no meaning; ignored
+# pragma warning(disable: 4275) // non dll-interface class ... used as base for dll-interface class ...
#endif
Modified: trunk/boost/test/impl/debug.ipp
==============================================================================
--- trunk/boost/test/impl/debug.ipp (original)
+++ trunk/boost/test/impl/debug.ipp 2008-07-06 22:27:32 EDT (Sun, 06 Jul 2008)
@@ -856,6 +856,11 @@
if( !created )
return false;
+ if( break_or_continue )
+ debugger_break();
+
+ return true;
+
#elif defined(BOOST_UNIX_BASED_DEBUG) // ********************** UNIX
char init_done_lock_fn[] = "/tmp/btl_dbg_init_done_XXXXXX";
@@ -902,16 +907,16 @@
// char dummy;
// while( ::read( init_done_lock_fd, &dummy, sizeof(char) ) == 0 );
+ if( break_or_continue )
+ debugger_break();
+
+ return true;
+
#else // ****************************************************** default
return false;
#endif
-
- if( break_or_continue )
- debugger_break();
-
- return true;
}
//____________________________________________________________________________//
Modified: trunk/boost/test/impl/execution_monitor.ipp
==============================================================================
--- trunk/boost/test/impl/execution_monitor.ipp (original)
+++ trunk/boost/test/impl/execution_monitor.ipp 2008-07-06 22:27:32 EDT (Sun, 06 Jul 2008)
@@ -993,7 +993,7 @@
int
execution_monitor::catch_signals( unit_test::callback0<int> const& F )
{
- _invalid_parameter_handler old_iph;
+ _invalid_parameter_handler old_iph = _invalid_parameter_handler();
if( !p_catch_system_errors )
_set_se_translator( &detail::seh_catch_preventer );