diff options
| author | Paolo Carlini <pcarlini@unitus.it> | 2002-01-28 21:06:15 +0100 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2002-01-28 20:06:15 +0000 |
| commit | 4debe14deb949b6ba322c14fc63e457678cfda23 (patch) | |
| tree | ca791396afe261a9752f8bb8fb213a831c81ce45 | |
| parent | 7dc3f8c01897a5df46880f9555db96deabfb0697 (diff) | |
| download | gcc-4debe14deb949b6ba322c14fc63e457678cfda23.zip gcc-4debe14deb949b6ba322c14fc63e457678cfda23.tar.gz gcc-4debe14deb949b6ba322c14fc63e457678cfda23.tar.bz2 | |
ostream_inserter_arith.cc (test03): Fix to deal correctly with both 32 bit and 64 bit architectures
2002-01-28 Paolo Carlini <pcarlini@unitus.it>
* testsuite/27_io/ostream_inserter_arith.cc (test03):
Fix to deal correctly with both 32 bit and 64 bit architectures
From-SVN: r49295
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc | 25 |
2 files changed, 24 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3370dae..044f549 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2002-01-28 Paolo Carlini <pcarlini@unitus.it> + + * testsuite/27_io/ostream_inserter_arith.cc (test03): + Fix to deal correctly with both 32 bit and 64 bit architectures + 2002-01-25 Loren Rittle <ljrittle@acm.org> * testsuite/thread/pthread1.cc: Use one condition variable diff --git a/libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc b/libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc index dd443d9..bf93950 100644 --- a/libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc +++ b/libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc @@ -311,16 +311,29 @@ test03() stringbuf strbuf; ostream o(&strbuf); - o << oct << s << ' ' << hex << s; - VERIFY( strbuf.str() == "177777 ffff" ); // Assuming 2byte-shorts + o << oct << s << ' ' << hex << s; + if (sizeof(short) == 2) + VERIFY( strbuf.str() == "177777 ffff" ); + else // sizeof(short) == 4 + VERIFY( strbuf.str() == "37777777777 ffffffff" ); strbuf.str(str_blank); - o << oct << i << ' ' << hex << i; - VERIFY( strbuf.str() == "37777777777 ffffffff" ); + o << oct << i << ' ' << hex << i; + if (sizeof(int) == 2) + VERIFY( strbuf.str() == "177777 ffff" ); + else if (sizeof(int) == 4) + VERIFY( strbuf.str() == "37777777777 ffffffff" ); + else // sizeof(int) == 8 + VERIFY( strbuf.str() == "1777777777777777777777 " + "ffffffffffffffff" ); strbuf.str(str_blank); - o << oct << l << ' ' << hex << l; - VERIFY( strbuf.str() == "37777777777 ffffffff" ); + o << oct << l << ' ' << hex << l; + if (sizeof(long) == 4) + VERIFY( strbuf.str() == "37777777777 ffffffff" ); + else // sizeof(long) == 8 + VERIFY( strbuf.str() == "1777777777777777777777 " + "ffffffffffffffff" ); strbuf.str(str_blank); o << showpos << hex << showbase << 11; |