Merged fixes from trunk to branch

[SVN r22142]
This commit is contained in:
Fernando Cacciola
2004-02-03 03:18:14 +00:00
parent b06ad2b08a
commit cf6c855c37

View File

@ -485,21 +485,12 @@ void test_throwing_assign_to_initialized( T const* )
BOOST_CHECK(!passed); BOOST_CHECK(!passed);
#ifdef BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION
// opt0 was left unmodified
check_is_pending_dtor( ARG(T) );
check_is_not_pending_copy( ARG(T) );
check_instance_count(count, ARG(T) );
check_initialized(opt0);
#else
// opt0 was left uninitialized // opt0 was left uninitialized
-- count ; -- count ;
check_is_not_pending_dtor( ARG(T) ); check_is_not_pending_dtor( ARG(T) );
check_is_not_pending_copy( ARG(T) ); check_is_not_pending_copy( ARG(T) );
check_instance_count(count, ARG(T) ); check_instance_count(count, ARG(T) );
check_uninitialized(opt0); check_uninitialized(opt0);
#endif
} }
// //