--- framework.ipp.orig 2008-10-13 19:20:26.000000000 +1100 +++ framework.ipp 2009-09-18 12:37:48.925648000 +1000 @@ -127,10 +127,13 @@ test_unit_store::value_type const& tu = *m_test_units.begin(); // the delete will erase this element from map - if( test_id_2_unit_type( tu.second->p_id ) == tut_suite ) - delete (test_suite const*)tu.second; - else - delete (test_case const*)tu.second; + if( test_id_2_unit_type( tu.second->p_id ) == tut_suite ) { + test_suite const* p = (test_suite const*)tu.second; + delete p; + } else { + test_case const* p = (test_case const*)tu.second; + delete p; + } } }