From 81b3665c8f5fef2481607f3fc5aa92d0de4601f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20J=C3=B8rgen=20Ottosen?= Date: Tue, 27 Jul 2004 12:29:02 +0000 Subject: [PATCH] *** empty log message *** [SVN r24112] --- test/string.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/test/string.cpp b/test/string.cpp index e67fe9f..f29b3dd 100755 --- a/test/string.cpp +++ b/test/string.cpp @@ -45,9 +45,9 @@ void check_char() { typedef char* char_iterator_t; typedef char char_array_t[10]; - const char* char_s = "a string"; - char my_string[] = "another string"; - const unsigned my_string_length = 14; + const char* char_s = "a string"; + char my_string[] = "another string"; + const unsigned my_string_length = 14; BOOST_STATIC_ASSERT(( is_same< value_type_of::type, @@ -74,10 +74,11 @@ void check_char() BOOST_STATIC_ASSERT(( is_same< result_iterator_of::type, const char* >::value )); BOOST_CHECK_EQUAL( begin( char_s ), char_s ); - const char* end1 = begin( char_s ) + size( char_s ); + std::size_t sz = size( char_s ); + const char* end1 = begin( char_s ) + sz; BOOST_CHECK_EQUAL( end( char_s ), end1 ); BOOST_CHECK_EQUAL( empty( char_s ), (char_s == 0 || char_s[0] == char()) ); - BOOST_CHECK_EQUAL( size( char_s ), std::char_traits::length( char_s ) ); + BOOST_CHECK_EQUAL( sz, std::char_traits::length( char_s ) ); BOOST_CHECK_EQUAL( begin( my_string ), my_string ); const char* end2 = begin( my_string ) + size( my_string ); @@ -116,10 +117,11 @@ void check_string() BOOST_STATIC_ASSERT(( is_same< result_iterator_of::type, wchar_iterator_t >::value )); BOOST_STATIC_ASSERT(( is_same< result_iterator_of::type, const wchar_t* >::value )); + std::size_t sz = size( char_ws ); BOOST_CHECK_EQUAL( begin( char_ws ), char_ws ); - BOOST_CHECK_EQUAL( end( char_ws ), (begin( char_ws ) + size( char_ws )) ); + BOOST_CHECK_EQUAL( end( char_ws ), (begin( char_ws ) + sz) ); BOOST_CHECK_EQUAL( empty( char_ws ), (char_ws == 0 || char_ws[0] == wchar_t()) ); - BOOST_CHECK_EQUAL( size( char_ws ), std::char_traits::length( char_ws ) ); + BOOST_CHECK_EQUAL( sz, std::char_traits::length( char_ws ) ); wchar_t to_search = L'n'; BOOST_CHECK( find( char_ws, to_search ) != end( char_ws ) );