diff --git a/test/string.cpp b/test/string.cpp index 3795276..c8c5268 100755 --- a/test/string.cpp +++ b/test/string.cpp @@ -68,19 +68,16 @@ void check_char() BOOST_STATIC_ASSERT(( is_same< range_size::type, std::size_t >::value )); BOOST_STATIC_ASSERT(( is_same< range_result_iterator::type, char_iterator_t >::value )); BOOST_STATIC_ASSERT(( is_same< range_result_iterator::type, const char* >::value )); - // - // note: why does is_same< result_iterator::type, const char* >::value - // fail?!? BOOST_STATIC_ASSERT(( is_same< range_value::type, char>::value )); - BOOST_STATIC_ASSERT(( is_same< range_iterator::type, char* >::value )); - BOOST_STATIC_ASSERT(( is_same< range_const_iterator::type, const char* >::value )); + BOOST_STATIC_ASSERT(( is_same< range_iterator::type, char* >::value )); + BOOST_STATIC_ASSERT(( is_same< range_const_iterator::type, const char* >::value )); BOOST_STATIC_ASSERT(( is_same< range_difference::type, ::std::ptrdiff_t >::value )); BOOST_STATIC_ASSERT(( is_same< range_size::type, std::size_t >::value )); - BOOST_STATIC_ASSERT(( is_same< range_result_iterator::type, char* >::value )); - BOOST_STATIC_ASSERT(( is_same< range_result_iterator::type, const char* >::value )); + BOOST_STATIC_ASSERT(( is_same< range_result_iterator::type, char* >::value )); + BOOST_STATIC_ASSERT(( is_same< range_result_iterator::type, const char* >::value )); BOOST_CHECK_EQUAL( begin( char_s ), char_s ); std::size_t sz = size( char_s ); @@ -136,11 +133,16 @@ void check_string() wchar_t to_search = L'n'; BOOST_CHECK( find( char_ws, to_search ) != end( char_ws ) ); + +#if BOOST_WORKAROUND(_MSC_VER, BOOST_TESTED_AT(1300)) + BOOST_CHECK( find( my_wstring, to_search ) != end( my_wstring ) ); + #endif +#endif find( check_rvalue_return(), 'n' ); - + }