git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

4.cc: Fix for 64-bit pointers. 

2004-03-16  Paolo Carlini  <pcarlini@suse.de>

	* 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.

From-SVN: r79580
This commit is contained in:
Paolo Carlini 2004-03-17 08:22:38 +00:00 committed by Benjamin Kosnik
parent 3e368284ac
commit e20036e26c
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2004-03-16 Paolo Carlini <pcarlini@suse.de>
* 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 <pcarlini@suse.de> 2004-03-15 Paolo Carlini <pcarlini@suse.de>
* include/bits/locale_facets.tcc (money_get<>::_M_extract): * include/bits/locale_facets.tcc (money_get<>::_M_extract):

14
libstdc++-v3/testsuite/22_locale/num_put/put/char/4.cc
View File

@ -1,6 +1,6 @@
// 2001-11-19 Benjamin Kosnik <bkoz@redhat.com> // 2001-11-19 Benjamin Kosnik <bkoz@redhat.com>
// 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 // 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 // software; you can redistribute it and/or modify it under the
@ -36,8 +36,8 @@ void test04()
typedef num_put<char, iter_type> num_put_type; typedef num_put<char, iter_type> num_put_type;
const locale loc_c = locale::classic(); const locale loc_c = locale::classic();
const string str("1798 Lady Elgin"); const string str("1798 Lady Elgin");
const string str2("0 true 0xbffff74c Mary Nisbet"); const string x(18, 'x'); // have to have allocated string!
const string x(15, 'x'); // have to have allocated string! // allow for "0x" + 16 hex digits (64-bit pointer)
string res; string res;
ostringstream oss; ostringstream oss;
@ -56,7 +56,7 @@ void test04()
res = x; res = x;
iter_type ret1 = tp.put(res.begin(), oss, ' ', l); iter_type ret1 = tp.put(res.begin(), oss, ' ', l);
string sanity1(res.begin(), ret1); string sanity1(res.begin(), ret1);
VERIFY( res == "1798xxxxxxxxxxx" ); VERIFY( res == "1798xxxxxxxxxxxxxx" );
VERIFY( sanity1 == "1798" ); VERIFY( sanity1 == "1798" );
// 02 put(long double) // 02 put(long double)
@ -64,7 +64,7 @@ void test04()
res = x; res = x;
iter_type ret2 = tp.put(res.begin(), oss, ' ', ld); iter_type ret2 = tp.put(res.begin(), oss, ' ', ld);
string sanity2(res.begin(), ret2); string sanity2(res.begin(), ret2);
VERIFY( res == "1798xxxxxxxxxxx" ); VERIFY( res == "1798xxxxxxxxxxxxxx" );
VERIFY( sanity2 == "1798" ); VERIFY( sanity2 == "1798" );
// 03 put(bool) // 03 put(bool)
@ -72,7 +72,7 @@ void test04()
res = x; res = x;
iter_type ret3 = tp.put(res.begin(), oss, ' ', b); iter_type ret3 = tp.put(res.begin(), oss, ' ', b);
string sanity3(res.begin(), ret3); string sanity3(res.begin(), ret3);
VERIFY( res == "1xxxxxxxxxxxxxx" ); VERIFY( res == "1xxxxxxxxxxxxxxxxx" );
VERIFY( sanity3 == "1" ); VERIFY( sanity3 == "1" );
b = 0; b = 0;
@ -80,7 +80,7 @@ void test04()
oss.setf(ios_base::boolalpha); oss.setf(ios_base::boolalpha);
iter_type ret4 = tp.put(res.begin(), oss, ' ', b); iter_type ret4 = tp.put(res.begin(), oss, ' ', b);
string sanity4(res.begin(), ret4); string sanity4(res.begin(), ret4);
VERIFY( res == "falsexxxxxxxxxx" ); VERIFY( res == "falsexxxxxxxxxxxxx" );
VERIFY( sanity4 == "false" ); VERIFY( sanity4 == "false" );
// 04 put(void*) // 04 put(void*)

17
libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/4.cc
View File

@ -1,6 +1,6 @@
// 2001-11-19 Benjamin Kosnik <bkoz@redhat.com> // 2001-11-19 Benjamin Kosnik <bkoz@redhat.com>
// 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 // 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 // software; you can redistribute it and/or modify it under the
@ -36,9 +36,8 @@ void test04()
typedef num_put<wchar_t, iter_type> num_put_type; typedef num_put<wchar_t, iter_type> num_put_type;
const locale loc_c = locale::classic(); const locale loc_c = locale::classic();
const wstring str(L"1798 Lady Elgin"); const wstring str(L"1798 Lady Elgin");
const wstring str2(L"0 true 0xbffff74c Mary Nisbet"); const wstring x(18, L'x'); // have to have allocated wstring!
const wstring x(15, L'x'); // have to have allocated wstring! wstring res; // allow for "0x" + 16 hex digits (64-bit pointer)
wstring res;
wostringstream oss; wostringstream oss;
oss.imbue(locale(loc_c, new num_put_type)); oss.imbue(locale(loc_c, new num_put_type));
@ -56,7 +55,7 @@ void test04()
res = x; res = x;
iter_type ret1 = tp.put(res.begin(), oss, ' ', l); iter_type ret1 = tp.put(res.begin(), oss, ' ', l);
wstring sanity1(res.begin(), ret1); wstring sanity1(res.begin(), ret1);
VERIFY( res == L"1798xxxxxxxxxxx" ); VERIFY( res == L"1798xxxxxxxxxxxxxx" );
VERIFY( sanity1 == L"1798" ); VERIFY( sanity1 == L"1798" );
// 02 put(long double) // 02 put(long double)
@ -64,7 +63,7 @@ void test04()
res = x; res = x;
iter_type ret2 = tp.put(res.begin(), oss, ' ', ld); iter_type ret2 = tp.put(res.begin(), oss, ' ', ld);
wstring sanity2(res.begin(), ret2); wstring sanity2(res.begin(), ret2);
VERIFY( res == L"1798xxxxxxxxxxx" ); VERIFY( res == L"1798xxxxxxxxxxxxxx" );
VERIFY( sanity2 == L"1798" ); VERIFY( sanity2 == L"1798" );
// 03 put(bool) // 03 put(bool)
@ -72,7 +71,7 @@ void test04()
res = x; res = x;
iter_type ret3 = tp.put(res.begin(), oss, ' ', b); iter_type ret3 = tp.put(res.begin(), oss, ' ', b);
wstring sanity3(res.begin(), ret3); wstring sanity3(res.begin(), ret3);
VERIFY( res == L"1xxxxxxxxxxxxxx" ); VERIFY( res == L"1xxxxxxxxxxxxxxxxx" );
VERIFY( sanity3 == L"1" ); VERIFY( sanity3 == L"1" );
b = 0; b = 0;
@ -80,7 +79,7 @@ void test04()
oss.setf(ios_base::boolalpha); oss.setf(ios_base::boolalpha);
iter_type ret4 = tp.put(res.begin(), oss, ' ', b); iter_type ret4 = tp.put(res.begin(), oss, ' ', b);
wstring sanity4(res.begin(), ret4); wstring sanity4(res.begin(), ret4);
VERIFY( res == L"falsexxxxxxxxxx" ); VERIFY( res == L"falsexxxxxxxxxxxxx" );
VERIFY( sanity4 == L"false" ); VERIFY( sanity4 == L"false" );
// 04 put(void*) // 04 put(void*)
@ -91,7 +90,7 @@ void test04()
iter_type ret5 = tp.put(res.begin(), oss, ' ', cv); iter_type ret5 = tp.put(res.begin(), oss, ' ', cv);
wstring sanity5(res.begin(), ret5); wstring sanity5(res.begin(), ret5);
VERIFY( sanity5.size() ); VERIFY( sanity5.size() );
VERIFY( sanity5[1] == 'x' ); VERIFY( sanity5[1] == L'x' );
} }
int main() int main()