diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2002-01-16 06:06:59 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2002-01-16 06:06:59 +0000 |
| commit | c22e177db75e9a9f9f1bd1c6d9e8553d734a5cf6 (patch) | |
| tree | c538d6edc041f519f7cc66b75e9f21872e7a335a | |
| parent | 7adf7680175b8f86a335dd8de2040778b02bfcbc (diff) | |
| download | gcc-c22e177db75e9a9f9f1bd1c6d9e8553d734a5cf6.zip gcc-c22e177db75e9a9f9f1bd1c6d9e8553d734a5cf6.tar.gz gcc-c22e177db75e9a9f9f1bd1c6d9e8553d734a5cf6.tar.bz2 | |
num_put_members_wchar_t.cc (test02): Same.
2002-01-15 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/22_locale/num_put_members_wchar_t.cc (test02): Same.
* testsuite/22_locale/num_put_members_char.cc (test01): Tweak.
From-SVN: r48901
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/22_locale/num_put_members_char.cc | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/22_locale/num_put_members_wchar_t.cc | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a73de4f..74a650c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2002-01-15 Benjamin Kosnik <bkoz@redhat.com> + * testsuite/22_locale/num_put_members_wchar_t.cc (test02): Same. + * testsuite/22_locale/num_put_members_char.cc (test01): Tweak. + +2002-01-15 Benjamin Kosnik <bkoz@redhat.com> + * include/bits/locale_facets.tcc (num_put::do_put(bool): Fix. (num_put::do_put(void*)): Fix. * testsuite/22_locale/num_put_members_char.cc (test02): Add. diff --git a/libstdc++-v3/testsuite/22_locale/num_put_members_char.cc b/libstdc++-v3/testsuite/22_locale/num_put_members_char.cc index 1ca5163..701ee2a 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put_members_char.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put_members_char.cc @@ -205,7 +205,7 @@ void test01() numpunct_de.decimal_point(), result1.size()) ); // Should contain an 'x'. - VERIFY( !char_traits<char>::find(result1.c_str(), 'x', result1.size()) ); + VERIFY( result1.find('x') == 1 ); #ifdef _GLIBCPP_USE_LONG_LONG long long ll1 = 9223372036854775807; @@ -287,7 +287,8 @@ void test02() oss.setf(ios_base::fixed, ios_base::floatfield); iter_type ret5 = tp.put(res.begin(), oss, ' ', cv); string sanity5(res.begin(), ret5); - VERIFY( !char_traits<char>::find(sanity5.c_str(), 'x', sanity5.size()) ); + VERIFY( sanity5.size() ); + VERIFY( sanity5[1] == 'x' ); } int main() diff --git a/libstdc++-v3/testsuite/22_locale/num_put_members_wchar_t.cc b/libstdc++-v3/testsuite/22_locale/num_put_members_wchar_t.cc index d502ee4..f3de2bd 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put_members_wchar_t.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put_members_wchar_t.cc @@ -206,7 +206,7 @@ void test01() numpunct_de.decimal_point(), result1.size()) ); // Should contain an 'x'. - VERIFY( !char_traits<wchar_t>::find(result1.c_str(), L'x', result1.size()) ); + VERIFY( result1.find(L'x') == 1 ); #ifdef _GLIBCPP_USE_LONG_LONG long long ll1 = 9223372036854775807; @@ -287,7 +287,8 @@ void test02() oss.setf(ios_base::fixed, ios_base::floatfield); iter_type ret5 = tp.put(res.begin(), oss, L' ', cv); wstring sanity5(res.begin(), ret5); - VERIFY( !char_traits<wchar_t>::find(sanity5.c_str(), L'x', sanity5.size()) ); + VERIFY( sanity5.size() ); + VERIFY( sanity5[1] == L'x' ); } #endif |