diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-01-16 06:06:59 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-01-16 06:06:59 +0000 |
| commit | debc57337c8e178324345a88577dbea7a4c078d8 (patch) | |
| tree | c538d6edc041f519f7cc66b75e9f21872e7a335a | |
| parent | 876526481d146a90b28db5298594a3cc943fc85b (diff) | |
| download | ppe42-gcc-debc57337c8e178324345a88577dbea7a4c078d8.tar.gz ppe42-gcc-debc57337c8e178324345a88577dbea7a4c078d8.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@48901 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 a73de4fea9e..74a650c46f9 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 1ca5163f37f..701ee2a0509 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 d502ee42ecb..f3de2bd25c2 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 |
