Ticket #4241: boosT_test.diff

vendor/boost/boost/test/impl/execution_monitor.ipp

@@ -1090 +1090 @@
 execution_monitor::catch_signals( unit_test::callback0<int> const& F )
 {
     _invalid_parameter_handler old_iph = _invalid_parameter_handler();
-    BOOST_TEST_CRT_HOOK_TYPE old_crt_hook;
+    BOOST_TEST_CRT_HOOK_TYPE old_crt_hook = 0;
 
     if( !p_catch_system_errors )
         _set_se_translator( &detail::seh_catch_preventer );

vendor/boost/boost/test/impl/framework.ipp

@@ -127 +127 @@
             test_unit_store::value_type const& tu = *m_test_units.begin();
 
             // the delete will erase this element from map
-            if( ut_detail::test_id_2_unit_type( tu.second->p_id ) == tut_suite )
-                delete  static_cast<test_suite const*>(tu.second);
-            else
-                delete  static_cast<test_case const*>(tu.second);
+            if( ut_detail::test_id_2_unit_type( tu.second->p_id ) == tut_suite ) {
+                test_suite const *p = static_cast<test_suite const*>(tu.second);
+                delete p;
+            } else {
+                test_case const *p = static_cast<test_case const*>(tu.second);
+                delete p;
+            }
         }
     }