diff options
author | Paolo Carlini <pcarlini@unitus.it> | 2002-01-30 21:45:18 +0100 |
---|---|---|
committer | Paolo Carlini <paolo@gcc.gnu.org> | 2002-01-30 20:45:18 +0000 |
commit | a852d50fb4f376a7bd79a9b05025dbc5590da378 (patch) | |
tree | c598a1ec2be2ee465607317edd905738e5ed8e44 | |
parent | 5748ebeb998a01e22e9e2ee1e649f46c42e6bece (diff) | |
download | gcc-a852d50fb4f376a7bd79a9b05025dbc5590da378.zip gcc-a852d50fb4f376a7bd79a9b05025dbc5590da378.tar.gz gcc-a852d50fb4f376a7bd79a9b05025dbc5590da378.tar.bz2 |
ostream_inserter_arith.cc (test03): Better fix for 32/64 bit architectures...
2002-01-30 Paolo Carlini <pcarlini@unitus.it>
* testsuite/27_io/ostream_inserter_arith.cc (test03):
Better fix for 32/64 bit architectures, avoiding the
implicit assumption that CHAR_BIT == 8.
From-SVN: r49342
-rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 71887a4..05ff24c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2002-01-30 Paolo Carlini <pcarlini@unitus.it> + + * testsuite/27_io/ostream_inserter_arith.cc (test03): + Better fix for 32/64 bit architectures, avoiding the + implicit assumption that CHAR_BIT == 8. + 2002-01-28 Phil Edwards <pme@gcc.gnu.org> * Makefile.am (doxygen, doxygen-maint, doxygen-man): Tweak targets. diff --git a/libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc b/libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc index bf93950..0025425 100644 --- a/libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc +++ b/libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc @@ -312,26 +312,26 @@ test03() ostream o(&strbuf); o << oct << s << ' ' << hex << s; - if (sizeof(short) == 2) + if (numeric_limits<short>::digits + 1 == 16) VERIFY( strbuf.str() == "177777 ffff" ); - else // sizeof(short) == 4 + else VERIFY( strbuf.str() == "37777777777 ffffffff" ); strbuf.str(str_blank); o << oct << i << ' ' << hex << i; - if (sizeof(int) == 2) + if (numeric_limits<int>::digits + 1 == 16) VERIFY( strbuf.str() == "177777 ffff" ); - else if (sizeof(int) == 4) + else if (numeric_limits<int>::digits + 1 == 32) VERIFY( strbuf.str() == "37777777777 ffffffff" ); - else // sizeof(int) == 8 + else VERIFY( strbuf.str() == "1777777777777777777777 " "ffffffffffffffff" ); strbuf.str(str_blank); o << oct << l << ' ' << hex << l; - if (sizeof(long) == 4) + if (numeric_limits<long>::digits + 1 == 32) VERIFY( strbuf.str() == "37777777777 ffffffff" ); - else // sizeof(long) == 8 + else VERIFY( strbuf.str() == "1777777777777777777777 " "ffffffffffffffff" ); strbuf.str(str_blank); |