From a852d50fb4f376a7bd79a9b05025dbc5590da378 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Wed, 30 Jan 2002 21:45:18 +0100 Subject: [PATCH] ostream_inserter_arith.cc (test03): Better fix for 32/64 bit architectures... 2002-01-30 Paolo Carlini * 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 --- libstdc++-v3/ChangeLog | 6 ++++++ .../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 71887a48a36..05ff24c8b55 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2002-01-30 Paolo Carlini + + * 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 * 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 bf93950c8c4..0025425a4f6 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::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::digits + 1 == 16) VERIFY( strbuf.str() == "177777 ffff" ); - else if (sizeof(int) == 4) + else if (numeric_limits::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::digits + 1 == 32) VERIFY( strbuf.str() == "37777777777 ffffffff" ); - else // sizeof(long) == 8 + else VERIFY( strbuf.str() == "1777777777777777777777 " "ffffffffffffffff" ); strbuf.str(str_blank); -- 2.30.2