From c22e177db75e9a9f9f1bd1c6d9e8553d734a5cf6 Mon Sep 17 00:00:00 2001
From: Benjamin Kosnik <bkoz@redhat.com>
Date: Wed, 16 Jan 2002 06:06:59 +0000
Subject: [PATCH] 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
---
libstdc++-v3/ChangeLog | 5 +++++
libstdc++-v3/testsuite/22_locale/num_put_members_char.cc | 5 +++--
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 a73de4fea9e8..74a650c46f9e 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+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.
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 1ca5163f37fd..701ee2a0509f 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 d502ee42ecb9..f3de2bd25c26 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
--
GitLab