From a5ccd11497d28d9117b475b8169a57920b72c03e Mon Sep 17 00:00:00 2001 From: bkoz Date: Wed, 17 Mar 2004 08:22:38 +0000 Subject: [PATCH] 2004-03-16 Paolo Carlini * testsuite/22_locale/num_put/put/char/4.cc: Fix for 64-bit pointers. * testsuite/22_locale/num_put/put/wchar_t/4.cc: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@79580 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/testsuite/22_locale/num_put/put/char/4.cc | 14 +++++++------- .../testsuite/22_locale/num_put/put/wchar_t/4.cc | 17 ++++++++--------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ff6a3977f61..247ddaf7348 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2004-03-16 Paolo Carlini + + * testsuite/22_locale/num_put/put/char/4.cc: Fix for 64-bit pointers. + * testsuite/22_locale/num_put/put/wchar_t/4.cc: Likewise. + 2004-03-15 Paolo Carlini * include/bits/locale_facets.tcc (money_get<>::_M_extract): diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/4.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/4.cc index e7b139b0270..2c9971a2038 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/char/4.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/4.cc @@ -1,6 +1,6 @@ // 2001-11-19 Benjamin Kosnik -// Copyright (C) 2001, 2002, 2003 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -36,8 +36,8 @@ void test04() typedef num_put num_put_type; const locale loc_c = locale::classic(); const string str("1798 Lady Elgin"); - const string str2("0 true 0xbffff74c Mary Nisbet"); - const string x(15, 'x'); // have to have allocated string! + const string x(18, 'x'); // have to have allocated string! + // allow for "0x" + 16 hex digits (64-bit pointer) string res; ostringstream oss; @@ -56,7 +56,7 @@ void test04() res = x; iter_type ret1 = tp.put(res.begin(), oss, ' ', l); string sanity1(res.begin(), ret1); - VERIFY( res == "1798xxxxxxxxxxx" ); + VERIFY( res == "1798xxxxxxxxxxxxxx" ); VERIFY( sanity1 == "1798" ); // 02 put(long double) @@ -64,7 +64,7 @@ void test04() res = x; iter_type ret2 = tp.put(res.begin(), oss, ' ', ld); string sanity2(res.begin(), ret2); - VERIFY( res == "1798xxxxxxxxxxx" ); + VERIFY( res == "1798xxxxxxxxxxxxxx" ); VERIFY( sanity2 == "1798" ); // 03 put(bool) @@ -72,7 +72,7 @@ void test04() res = x; iter_type ret3 = tp.put(res.begin(), oss, ' ', b); string sanity3(res.begin(), ret3); - VERIFY( res == "1xxxxxxxxxxxxxx" ); + VERIFY( res == "1xxxxxxxxxxxxxxxxx" ); VERIFY( sanity3 == "1" ); b = 0; @@ -80,7 +80,7 @@ void test04() oss.setf(ios_base::boolalpha); iter_type ret4 = tp.put(res.begin(), oss, ' ', b); string sanity4(res.begin(), ret4); - VERIFY( res == "falsexxxxxxxxxx" ); + VERIFY( res == "falsexxxxxxxxxxxxx" ); VERIFY( sanity4 == "false" ); // 04 put(void*) diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/4.cc index 3fc65175492..5de209f7ded 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/4.cc @@ -1,6 +1,6 @@ // 2001-11-19 Benjamin Kosnik -// Copyright (C) 2001, 2002, 2003 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -36,9 +36,8 @@ void test04() typedef num_put num_put_type; const locale loc_c = locale::classic(); const wstring str(L"1798 Lady Elgin"); - const wstring str2(L"0 true 0xbffff74c Mary Nisbet"); - const wstring x(15, L'x'); // have to have allocated wstring! - wstring res; + const wstring x(18, L'x'); // have to have allocated wstring! + wstring res; // allow for "0x" + 16 hex digits (64-bit pointer) wostringstream oss; oss.imbue(locale(loc_c, new num_put_type)); @@ -56,7 +55,7 @@ void test04() res = x; iter_type ret1 = tp.put(res.begin(), oss, ' ', l); wstring sanity1(res.begin(), ret1); - VERIFY( res == L"1798xxxxxxxxxxx" ); + VERIFY( res == L"1798xxxxxxxxxxxxxx" ); VERIFY( sanity1 == L"1798" ); // 02 put(long double) @@ -64,7 +63,7 @@ void test04() res = x; iter_type ret2 = tp.put(res.begin(), oss, ' ', ld); wstring sanity2(res.begin(), ret2); - VERIFY( res == L"1798xxxxxxxxxxx" ); + VERIFY( res == L"1798xxxxxxxxxxxxxx" ); VERIFY( sanity2 == L"1798" ); // 03 put(bool) @@ -72,7 +71,7 @@ void test04() res = x; iter_type ret3 = tp.put(res.begin(), oss, ' ', b); wstring sanity3(res.begin(), ret3); - VERIFY( res == L"1xxxxxxxxxxxxxx" ); + VERIFY( res == L"1xxxxxxxxxxxxxxxxx" ); VERIFY( sanity3 == L"1" ); b = 0; @@ -80,7 +79,7 @@ void test04() oss.setf(ios_base::boolalpha); iter_type ret4 = tp.put(res.begin(), oss, ' ', b); wstring sanity4(res.begin(), ret4); - VERIFY( res == L"falsexxxxxxxxxx" ); + VERIFY( res == L"falsexxxxxxxxxxxxx" ); VERIFY( sanity4 == L"false" ); // 04 put(void*) @@ -91,7 +90,7 @@ void test04() iter_type ret5 = tp.put(res.begin(), oss, ' ', cv); wstring sanity5(res.begin(), ret5); VERIFY( sanity5.size() ); - VERIFY( sanity5[1] == 'x' ); + VERIFY( sanity5[1] == L'x' ); } int main() -- 2.11.4.GIT