diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2007-04-11 15:19:15 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2007-04-11 15:19:15 +0000 |
| commit | 90737ab777cc13f3c3aaf8e9c352254df3ad6866 (patch) | |
| tree | 990efb8ae32702ecec0ecea8294040b6d340f442 /libstdc++-v3/testsuite/22_locale/num_get/get | |
| parent | 4bf371ea7e02b09ea657e8e6340b1b55ea210c6c (diff) | |
| download | gcc-90737ab777cc13f3c3aaf8e9c352254df3ad6866.zip gcc-90737ab777cc13f3c3aaf8e9c352254df3ad6866.tar.gz gcc-90737ab777cc13f3c3aaf8e9c352254df3ad6866.tar.bz2 | |
locale_facets.tcc (num_get<>::do_get(iter_type, ios_base&, ios_base::iostate&, void*&)): Fix for sizeof(void*) > sizeof(unsigned long).
2007-04-11 Paolo Carlini <pcarlini@suse.de>
* include/bits/locale_facets.tcc (num_get<>::do_get(iter_type,
ios_base&, ios_base::iostate&, void*&)): Fix for sizeof(void*)
> sizeof(unsigned long).
* testsuite/22_locale/num_get/get/char/1.cc: Fix void* test.
* testsuite/22_locale/num_get/get/wchar_t/1.cc: Likewise.
* testsuite/22_locale/num_put/put/char/1.cc: Tweak comment.
* testsuite/22_locale/num_put/put/wchar_t/1.cc: Likewise.
From-SVN: r123716
Diffstat (limited to 'libstdc++-v3/testsuite/22_locale/num_get/get')
| -rw-r--r-- | libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc | 10 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc index 8ff9852..266388f 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc @@ -2,7 +2,8 @@ // 2001-11-21 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 +// 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 @@ -51,8 +52,7 @@ void test01() double d; long double ld1 = 6.630025e+4; long double ld; - void* v; - const void* cv = &ul2; + void* v = 0; // cache the num_get facet istringstream iss; @@ -125,12 +125,12 @@ void test01() VERIFY( ld == 0 ); VERIFY( err == goodbit ); - // const void + // void* iss.str("0xbffff74c,"); iss.clear(); err = goodbit; ng.get(iss.rdbuf(), 0, iss, err, v); - VERIFY( &v != &cv ); + VERIFY( v != 0 ); VERIFY( err == goodbit ); #ifdef _GLIBCXX_USE_LONG_LONG diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc index 4e54397..43cfa93 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc @@ -2,7 +2,8 @@ // 2001-11-21 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 +// 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 @@ -52,7 +53,6 @@ void test01() long double ld1 = 6.630025e+4; long double ld; void* v; - const void* cv = &ul2; // cache the num_get facet wistringstream iss; @@ -124,12 +124,12 @@ void test01() VERIFY( ld == 0 ); VERIFY( err == goodbit ); - // const void + // void* iss.str(L"0xbffff74c,"); iss.clear(); err = goodbit; ng.get(iss.rdbuf(), 0, iss, err, v); - VERIFY( &v != &cv ); + VERIFY( v != 0 ); VERIFY( err == goodbit ); #ifdef _GLIBCXX_USE_LONG_LONG |