--- /tmp/ediff4016qbV 2008-12-07 08:58:12.000000000 -0500 +++ /usr/local/boost_1_36_0/boost/test/impl/unit_test_main.ipp 2008-12-07 08:53:36.000000000 -0500 @@ -103,7 +103,7 @@ explicit test_case_filter( const_string tc_to_tun ) : m_depth( 0 ) { -#if !defined(__BORLANDC__) && BOOST_WORKAROUND( BOOST_MSVC, >= 1300) +#if !defined(__BORLANDC__) && ( !defined(BOOST_MSVC) || BOOST_WORKAROUND( BOOST_MSVC, >= 1300) ) string_token_iterator tit( tc_to_tun, (dropped_delimeters = "/", kept_delimeters = dt_none) ); while( tit != string_token_iterator() ) {