From 31131ac1e6325565c3927b57ef3d4bd3bf6c042b Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Wed, 5 Oct 2005 19:11:18 +0000 Subject: [PATCH] re PR libstdc++/24198 (Remove from the testsuite gnu_char_type (or fix it)) 2005-10-05 Paolo Carlini PR libstdc++/24198 * testsuite/27_io/basic_filebuf/3.cc: Use __gnu_test::pod_ushort instead. * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc: Likewise. * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc: Likewise. * testsuite/27_io/basic_fstream/3.cc: Likewise; run the test. * testsuite/27_io/basic_ifstream/3.cc: Likewise; run the test. * testsuite/27_io/basic_ios/3.cc: Likewise. * testsuite/27_io/basic_iostream/3.cc: Likewise; run the test. * testsuite/27_io/basic_istream/3.cc: Likewise; run the test. * testsuite/27_io/basic_istringstream/3.cc: Likewise; run the test. * testsuite/27_io/basic_ofstream/3.cc: Likewise; run the test. * testsuite/27_io/basic_ostream/3.cc: Likewise; run the test. * testsuite/27_io/basic_ostringstream/3.cc: Likewise; run the test. * testsuite/27_io/basic_streambuf/3.cc: Likewise. * testsuite/27_io/basic_stringbuf/3.cc: Likewise. * testsuite/27_io/basic_stringstream/3.cc: Likewise; run the test. From-SVN: r105010 --- libstdc++-v3/ChangeLog | 20 ++++ .../testsuite/27_io/basic_filebuf/3.cc | 91 +----------------- .../27_io/basic_filebuf/seekoff/10132-2.cc | 91 +----------------- .../27_io/basic_filebuf/seekpos/10132-3.cc | 91 +----------------- .../testsuite/27_io/basic_fstream/3.cc | 93 +------------------ .../testsuite/27_io/basic_ifstream/3.cc | 93 +------------------ libstdc++-v3/testsuite/27_io/basic_ios/3.cc | 91 +----------------- .../testsuite/27_io/basic_iostream/3.cc | 93 +------------------ .../testsuite/27_io/basic_istream/3.cc | 93 +------------------ .../testsuite/27_io/basic_istringstream/3.cc | 93 +------------------ .../testsuite/27_io/basic_ofstream/3.cc | 93 +------------------ .../testsuite/27_io/basic_ostream/3.cc | 93 +------------------ .../testsuite/27_io/basic_ostringstream/3.cc | 93 +------------------ .../testsuite/27_io/basic_streambuf/3.cc | 91 +----------------- .../testsuite/27_io/basic_stringbuf/3.cc | 91 +----------------- .../testsuite/27_io/basic_stringstream/3.cc | 93 +------------------ 16 files changed, 65 insertions(+), 1338 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 940f6ab45dc..81d4268594d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,23 @@ +2005-10-05 Paolo Carlini + + PR libstdc++/24198 + * testsuite/27_io/basic_filebuf/3.cc: Use __gnu_test::pod_ushort + instead. + * testsuite/27_io/basic_filebuf/seekoff/10132-2.cc: Likewise. + * testsuite/27_io/basic_filebuf/seekpos/10132-3.cc: Likewise. + * testsuite/27_io/basic_fstream/3.cc: Likewise; run the test. + * testsuite/27_io/basic_ifstream/3.cc: Likewise; run the test. + * testsuite/27_io/basic_ios/3.cc: Likewise. + * testsuite/27_io/basic_iostream/3.cc: Likewise; run the test. + * testsuite/27_io/basic_istream/3.cc: Likewise; run the test. + * testsuite/27_io/basic_istringstream/3.cc: Likewise; run the test. + * testsuite/27_io/basic_ofstream/3.cc: Likewise; run the test. + * testsuite/27_io/basic_ostream/3.cc: Likewise; run the test. + * testsuite/27_io/basic_ostringstream/3.cc: Likewise; run the test. + * testsuite/27_io/basic_streambuf/3.cc: Likewise. + * testsuite/27_io/basic_stringbuf/3.cc: Likewise. + * testsuite/27_io/basic_stringstream/3.cc: Likewise; run the test. + 2005-10-05 Paolo Carlini PR libstdc++/11729 (DR 280, [Ready]) diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/3.cc index f9f65da4a3a..8ead347dc69 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/3.cc @@ -1,6 +1,6 @@ // 1999-01-17 bkoz test functionality of basic_filebuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -24,99 +24,14 @@ #include #include +#include // libstdc++/2020 // should be able to use custom char_type, custom traits type -class gnu_char_type -{ - unsigned long character; -public: - // operator == - bool - operator==(const gnu_char_type& __lhs) - { return character == __lhs.character; } - - // operator < - bool - operator<(const gnu_char_type& __lhs) - { return character < __lhs.character; } - - // default ctor - gnu_char_type() { } - - // to_char_type - gnu_char_type(const unsigned long& __l) : character(__l) { } - - // to_int_type - operator unsigned long() const { return character; } -}; - -// char_traits specialization -struct gnu_char_traits -{ - typedef gnu_char_type char_type; - typedef long int_type; - typedef std::streamoff off_type; - typedef long state_type; - typedef std::fpos pos_type; - - static void - assign(char_type& __c1, const char_type& __c2) { } - - static bool - eq(const char_type& __c1, const char_type& __c2) { return true; } - - static bool - lt(const char_type& __c1, const char_type& __c2) { return true; } - - static int - compare(const char_type* __s1, const char_type* __s2, size_t __n) - { return 0; } - - static size_t - length(const char_type* __s) { return 0; } - - static const char_type* - find(const char_type* __s, size_t __n, const char_type& __a) - { return __s; } - - static char_type* - move(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - copy(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - assign(char_type* __s, size_t __n, char_type __a) - { return __s; } - - static char_type - to_char_type(const int_type& __c) - { return char_type(); } - - static int_type - to_int_type(const char_type& __c) - { return int_type(); } - - static bool - eq_int_type(const int_type& __c1, const int_type& __c2) - { return true; } - - static int_type - eof() - { return int_type(); } - - static int_type - not_eof(const int_type& __c) - { return int_type(); } -}; - void test07() { bool test __attribute__((unused)) = true; - typedef std::basic_filebuf gnu_filebuf; + typedef std::basic_filebuf<__gnu_test::pod_ushort> gnu_filebuf; try { gnu_filebuf obj; } diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/10132-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/10132-2.cc index d9ec65bfc9d..646276916c9 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/10132-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/10132-2.cc @@ -1,6 +1,6 @@ // 2003-04-24 bkoz -// Copyright (C) 2003 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. // // 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 @@ -23,98 +23,13 @@ #include #include +#include // libstdc++/10132, add on -class gnu_char_type -{ - unsigned long character; -public: - // operator == - bool - operator==(const gnu_char_type& __lhs) - { return character == __lhs.character; } - - // operator < - bool - operator<(const gnu_char_type& __lhs) - { return character < __lhs.character; } - - // default ctor - gnu_char_type() { } - - // to_char_type - gnu_char_type(const unsigned long& __l) : character(__l) { } - - // to_int_type - operator unsigned long() const { return character; } -}; - -// char_traits specialization -struct gnu_char_traits -{ - typedef gnu_char_type char_type; - typedef long int_type; - typedef std::streamoff off_type; - typedef long state_type; - typedef std::fpos pos_type; - - static void - assign(char_type& __c1, const char_type& __c2) { } - - static bool - eq(const char_type& __c1, const char_type& __c2) { return true; } - - static bool - lt(const char_type& __c1, const char_type& __c2) { return true; } - - static int - compare(const char_type* __s1, const char_type* __s2, size_t __n) - { return 0; } - - static size_t - length(const char_type* __s) { return 0; } - - static const char_type* - find(const char_type* __s, size_t __n, const char_type& __a) - { return __s; } - - static char_type* - move(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - copy(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - assign(char_type* __s, size_t __n, char_type __a) - { return __s; } - - static char_type - to_char_type(const int_type& __c) - { return char_type(); } - - static int_type - to_int_type(const char_type& __c) - { return int_type(); } - - static bool - eq_int_type(const int_type& __c1, const int_type& __c2) - { return true; } - - static int_type - eof() - { return int_type(); } - - static int_type - not_eof(const int_type& __c) - { return int_type(); } -}; - void test07() { bool test __attribute__((unused)) = true; - typedef std::basic_filebuf gnu_filebuf; + typedef std::basic_filebuf<__gnu_test::pod_ushort> gnu_filebuf; try { diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/10132-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/10132-3.cc index da613a13bfe..7123369212b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/10132-3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/10132-3.cc @@ -1,6 +1,6 @@ // 2003-04-24 bkoz -// Copyright (C) 2003 Free Software Foundation, Inc. +// Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. // // 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 @@ -23,98 +23,13 @@ #include #include +#include // libstdc++/10132, add on -class gnu_char_type -{ - unsigned long character; -public: - // operator == - bool - operator==(const gnu_char_type& __lhs) - { return character == __lhs.character; } - - // operator < - bool - operator<(const gnu_char_type& __lhs) - { return character < __lhs.character; } - - // default ctor - gnu_char_type() { } - - // to_char_type - gnu_char_type(const unsigned long& __l) : character(__l) { } - - // to_int_type - operator unsigned long() const { return character; } -}; - -// char_traits specialization -struct gnu_char_traits -{ - typedef gnu_char_type char_type; - typedef long int_type; - typedef std::streamoff off_type; - typedef long state_type; - typedef std::fpos pos_type; - - static void - assign(char_type& __c1, const char_type& __c2) { } - - static bool - eq(const char_type& __c1, const char_type& __c2) { return true; } - - static bool - lt(const char_type& __c1, const char_type& __c2) { return true; } - - static int - compare(const char_type* __s1, const char_type* __s2, size_t __n) - { return 0; } - - static size_t - length(const char_type* __s) { return 0; } - - static const char_type* - find(const char_type* __s, size_t __n, const char_type& __a) - { return __s; } - - static char_type* - move(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - copy(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - assign(char_type* __s, size_t __n, char_type __a) - { return __s; } - - static char_type - to_char_type(const int_type& __c) - { return char_type(); } - - static int_type - to_int_type(const char_type& __c) - { return int_type(); } - - static bool - eq_int_type(const int_type& __c1, const int_type& __c2) - { return true; } - - static int_type - eof() - { return int_type(); } - - static int_type - not_eof(const int_type& __c) - { return int_type(); } -}; - void test07() { bool test __attribute__((unused)) = true; - typedef std::basic_filebuf gnu_filebuf; + typedef std::basic_filebuf<__gnu_test::pod_ushort> gnu_filebuf; try { diff --git a/libstdc++-v3/testsuite/27_io/basic_fstream/3.cc b/libstdc++-v3/testsuite/27_io/basic_fstream/3.cc index 2de3b8524ca..4b01bd10ef4 100644 --- a/libstdc++-v3/testsuite/27_io/basic_fstream/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_fstream/3.cc @@ -1,6 +1,6 @@ // 1999-01-17 bkoz test functionality of basic_filebuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -24,101 +24,14 @@ #include #include - -// { dg-do compile } +#include // libstdc++/2020 // should be able to use custom char_type, custom traits type -class gnu_char_type -{ - unsigned long character; -public: - // operator == - bool - operator==(const gnu_char_type& __lhs) - { return character == __lhs.character; } - - // operator < - bool - operator<(const gnu_char_type& __lhs) - { return character < __lhs.character; } - - // default ctor - gnu_char_type() { } - - // to_char_type - gnu_char_type(const unsigned long& __l) : character(__l) { } - - // to_int_type - operator unsigned long() const { return character; } -}; - -// char_traits specialization -struct gnu_char_traits -{ - typedef gnu_char_type char_type; - typedef long int_type; - typedef std::streamoff off_type; - typedef long state_type; - typedef std::fpos pos_type; - - static void - assign(char_type& __c1, const char_type& __c2) { } - - static bool - eq(const char_type& __c1, const char_type& __c2) { return true; } - - static bool - lt(const char_type& __c1, const char_type& __c2) { return true; } - - static int - compare(const char_type* __s1, const char_type* __s2, size_t __n) - { return 0; } - - static size_t - length(const char_type* __s) { return 0; } - - static const char_type* - find(const char_type* __s, size_t __n, const char_type& __a) - { return __s; } - - static char_type* - move(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - copy(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - assign(char_type* __s, size_t __n, char_type __a) - { return __s; } - - static char_type - to_char_type(const int_type& __c) - { return char_type(); } - - static int_type - to_int_type(const char_type& __c) - { return int_type(); } - - static bool - eq_int_type(const int_type& __c1, const int_type& __c2) - { return true; } - - static int_type - eof() - { return int_type(); } - - static int_type - not_eof(const int_type& __c) - { return int_type(); } -}; - void test07() { bool test __attribute__((unused)) = true; - typedef std::basic_fstream gnu_fstr; + typedef std::basic_fstream<__gnu_test::pod_ushort> gnu_fstr; try { diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/3.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/3.cc index b0a5a4d43a0..896e7028c23 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ifstream/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/3.cc @@ -1,6 +1,6 @@ // 1999-01-17 bkoz test functionality of basic_filebuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -24,101 +24,14 @@ #include #include - -// { dg-do compile } +#include // libstdc++/2020 // should be able to use custom char_type, custom traits type -class gnu_char_type -{ - unsigned long character; -public: - // operator == - bool - operator==(const gnu_char_type& __lhs) - { return character == __lhs.character; } - - // operator < - bool - operator<(const gnu_char_type& __lhs) - { return character < __lhs.character; } - - // default ctor - gnu_char_type() { } - - // to_char_type - gnu_char_type(const unsigned long& __l) : character(__l) { } - - // to_int_type - operator unsigned long() const { return character; } -}; - -// char_traits specialization -struct gnu_char_traits -{ - typedef gnu_char_type char_type; - typedef long int_type; - typedef std::streamoff off_type; - typedef long state_type; - typedef std::fpos pos_type; - - static void - assign(char_type& __c1, const char_type& __c2) { } - - static bool - eq(const char_type& __c1, const char_type& __c2) { return true; } - - static bool - lt(const char_type& __c1, const char_type& __c2) { return true; } - - static int - compare(const char_type* __s1, const char_type* __s2, size_t __n) - { return 0; } - - static size_t - length(const char_type* __s) { return 0; } - - static const char_type* - find(const char_type* __s, size_t __n, const char_type& __a) - { return __s; } - - static char_type* - move(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - copy(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - assign(char_type* __s, size_t __n, char_type __a) - { return __s; } - - static char_type - to_char_type(const int_type& __c) - { return char_type(); } - - static int_type - to_int_type(const char_type& __c) - { return int_type(); } - - static bool - eq_int_type(const int_type& __c1, const int_type& __c2) - { return true; } - - static int_type - eof() - { return int_type(); } - - static int_type - not_eof(const int_type& __c) - { return int_type(); } -}; - void test07() { bool test __attribute__((unused)) = true; - typedef std::basic_ifstream gnu_ifstr; + typedef std::basic_ifstream<__gnu_test::pod_ushort> gnu_ifstr; try { diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/3.cc b/libstdc++-v3/testsuite/27_io/basic_ios/3.cc index 255617ab482..6b3f7006f45 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ios/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ios/3.cc @@ -1,6 +1,6 @@ // 1999-01-17 bkoz test functionality of basic_filebuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -24,96 +24,11 @@ #include #include +#include // libstdc++/2020 // should be able to use custom char_type, custom traits type -class gnu_char_type -{ - unsigned long character; -public: - // operator == - bool - operator==(const gnu_char_type& __lhs) - { return character == __lhs.character; } - - // operator < - bool - operator<(const gnu_char_type& __lhs) - { return character < __lhs.character; } - - // default ctor - gnu_char_type() { } - - // to_char_type - gnu_char_type(const unsigned long& __l) : character(__l) { } - - // to_int_type - operator unsigned long() const { return character; } -}; - -// char_traits specialization -struct gnu_char_traits -{ - typedef gnu_char_type char_type; - typedef long int_type; - typedef long pos_type; - typedef unsigned long off_type; - typedef long state_type; - - static void - assign(char_type& __c1, const char_type& __c2) { } - - static bool - eq(const char_type& __c1, const char_type& __c2) { return true; } - - static bool - lt(const char_type& __c1, const char_type& __c2) { return true; } - - static int - compare(const char_type* __s1, const char_type* __s2, size_t __n) - { return 0; } - - static size_t - length(const char_type* __s) { return 0; } - - static const char_type* - find(const char_type* __s, size_t __n, const char_type& __a) - { return __s; } - - static char_type* - move(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - copy(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - assign(char_type* __s, size_t __n, char_type __a) - { return __s; } - - static char_type - to_char_type(const int_type& __c) - { return char_type(); } - - static int_type - to_int_type(const char_type& __c) - { return int_type(); } - - static bool - eq_int_type(const int_type& __c1, const int_type& __c2) - { return true; } - - static int_type - eof() - { return int_type(); } - - static int_type - not_eof(const int_type& __c) - { return int_type(); } -}; - -class gnu_ios: public std::basic_ios +class gnu_ios: public std::basic_ios<__gnu_test::pod_ushort> { }; void test07() diff --git a/libstdc++-v3/testsuite/27_io/basic_iostream/3.cc b/libstdc++-v3/testsuite/27_io/basic_iostream/3.cc index 0aa53acc710..e0af3ebd3e6 100644 --- a/libstdc++-v3/testsuite/27_io/basic_iostream/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_iostream/3.cc @@ -1,6 +1,6 @@ // 1999-01-17 bkoz test functionality of basic_filebuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -24,101 +24,14 @@ #include #include - -// { dg-do compile } +#include // libstdc++/2020 // should be able to use custom char_type, custom traits type -class gnu_char_type -{ - unsigned long character; -public: - // operator == - bool - operator==(const gnu_char_type& __lhs) - { return character == __lhs.character; } - - // operator < - bool - operator<(const gnu_char_type& __lhs) - { return character < __lhs.character; } - - // default ctor - gnu_char_type() { } - - // to_char_type - gnu_char_type(const unsigned long& __l) : character(__l) { } - - // to_int_type - operator unsigned long() const { return character; } -}; - -// char_traits specialization -struct gnu_char_traits -{ - typedef gnu_char_type char_type; - typedef long int_type; - typedef long pos_type; - typedef unsigned long off_type; - typedef long state_type; - - static void - assign(char_type& __c1, const char_type& __c2) { } - - static bool - eq(const char_type& __c1, const char_type& __c2) { return true; } - - static bool - lt(const char_type& __c1, const char_type& __c2) { return true; } - - static int - compare(const char_type* __s1, const char_type* __s2, size_t __n) - { return 0; } - - static size_t - length(const char_type* __s) { return 0; } - - static const char_type* - find(const char_type* __s, size_t __n, const char_type& __a) - { return __s; } - - static char_type* - move(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - copy(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - assign(char_type* __s, size_t __n, char_type __a) - { return __s; } - - static char_type - to_char_type(const int_type& __c) - { return char_type(); } - - static int_type - to_int_type(const char_type& __c) - { return int_type(); } - - static bool - eq_int_type(const int_type& __c1, const int_type& __c2) - { return true; } - - static int_type - eof() - { return int_type(); } - - static int_type - not_eof(const int_type& __c) - { return int_type(); } -}; - void test07() { bool test __attribute__((unused)) = true; - typedef std::basic_iostream gnu_iostr; + typedef std::basic_iostream<__gnu_test::pod_ushort> gnu_iostr; try { diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/3.cc index 5b2dcab4834..a2cadef507c 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/3.cc @@ -1,6 +1,6 @@ // 1999-01-17 bkoz test functionality of basic_filebuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -24,101 +24,14 @@ #include #include - -// { dg-do compile } +#include // libstdc++/2020 // should be able to use custom char_type, custom traits type -class gnu_char_type -{ - unsigned long character; -public: - // operator == - bool - operator==(const gnu_char_type& __lhs) - { return character == __lhs.character; } - - // operator < - bool - operator<(const gnu_char_type& __lhs) - { return character < __lhs.character; } - - // default ctor - gnu_char_type() { } - - // to_char_type - gnu_char_type(const unsigned long& __l) : character(__l) { } - - // to_int_type - operator unsigned long() const { return character; } -}; - -// char_traits specialization -struct gnu_char_traits -{ - typedef gnu_char_type char_type; - typedef long int_type; - typedef long pos_type; - typedef unsigned long off_type; - typedef long state_type; - - static void - assign(char_type& __c1, const char_type& __c2) { } - - static bool - eq(const char_type& __c1, const char_type& __c2) { return true; } - - static bool - lt(const char_type& __c1, const char_type& __c2) { return true; } - - static int - compare(const char_type* __s1, const char_type* __s2, size_t __n) - { return 0; } - - static size_t - length(const char_type* __s) { return 0; } - - static const char_type* - find(const char_type* __s, size_t __n, const char_type& __a) - { return __s; } - - static char_type* - move(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - copy(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - assign(char_type* __s, size_t __n, char_type __a) - { return __s; } - - static char_type - to_char_type(const int_type& __c) - { return char_type(); } - - static int_type - to_int_type(const char_type& __c) - { return int_type(); } - - static bool - eq_int_type(const int_type& __c1, const int_type& __c2) - { return true; } - - static int_type - eof() - { return int_type(); } - - static int_type - not_eof(const int_type& __c) - { return int_type(); } -}; - void test07() { bool test __attribute__((unused)) = true; - typedef std::basic_istream gnu_istr; + typedef std::basic_istream<__gnu_test::pod_ushort> gnu_istr; try { gnu_istr obj(NULL); } diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/3.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/3.cc index 96f3d6a5c1f..9f5285a7df1 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istringstream/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/3.cc @@ -1,6 +1,6 @@ // 1999-01-17 bkoz test functionality of basic_filebuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -24,101 +24,14 @@ #include #include - -// { dg-do compile } +#include // libstdc++/2020 // should be able to use custom char_type, custom traits type -class gnu_char_type -{ - unsigned long character; -public: - // operator == - bool - operator==(const gnu_char_type& __lhs) - { return character == __lhs.character; } - - // operator < - bool - operator<(const gnu_char_type& __lhs) - { return character < __lhs.character; } - - // default ctor - gnu_char_type() { } - - // to_char_type - gnu_char_type(const unsigned long& __l) : character(__l) { } - - // to_int_type - operator unsigned long() const { return character; } -}; - -// char_traits specialization -struct gnu_char_traits -{ - typedef gnu_char_type char_type; - typedef long int_type; - typedef long pos_type; - typedef long off_type; - typedef long state_type; - - static void - assign(char_type& __c1, const char_type& __c2) { } - - static bool - eq(const char_type& __c1, const char_type& __c2) { return true; } - - static bool - lt(const char_type& __c1, const char_type& __c2) { return true; } - - static int - compare(const char_type* __s1, const char_type* __s2, size_t __n) - { return 0; } - - static size_t - length(const char_type* __s) { return 0; } - - static const char_type* - find(const char_type* __s, size_t __n, const char_type& __a) - { return __s; } - - static char_type* - move(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - copy(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - assign(char_type* __s, size_t __n, char_type __a) - { return __s; } - - static char_type - to_char_type(const int_type& __c) - { return char_type(); } - - static int_type - to_int_type(const char_type& __c) - { return int_type(); } - - static bool - eq_int_type(const int_type& __c1, const int_type& __c2) - { return true; } - - static int_type - eof() - { return int_type(); } - - static int_type - not_eof(const int_type& __c) - { return int_type(); } -}; - void test07() { bool test __attribute__((unused)) = true; - typedef std::basic_istringstream gnu_isstr; + typedef std::basic_istringstream<__gnu_test::pod_ushort> gnu_isstr; try { diff --git a/libstdc++-v3/testsuite/27_io/basic_ofstream/3.cc b/libstdc++-v3/testsuite/27_io/basic_ofstream/3.cc index 3e177045a3f..8ef65088924 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ofstream/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ofstream/3.cc @@ -1,6 +1,6 @@ // 1999-01-17 bkoz test functionality of basic_filebuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -24,101 +24,14 @@ #include #include - -// { dg-do compile } +#include // libstdc++/2020 // should be able to use custom char_type, custom traits type -class gnu_char_type -{ - unsigned long character; -public: - // operator == - bool - operator==(const gnu_char_type& __lhs) - { return character == __lhs.character; } - - // operator < - bool - operator<(const gnu_char_type& __lhs) - { return character < __lhs.character; } - - // default ctor - gnu_char_type() { } - - // to_char_type - gnu_char_type(const unsigned long& __l) : character(__l) { } - - // to_int_type - operator unsigned long() const { return character; } -}; - -// char_traits specialization -struct gnu_char_traits -{ - typedef gnu_char_type char_type; - typedef long int_type; - typedef std::streamoff off_type; - typedef long state_type; - typedef std::fpos pos_type; - - static void - assign(char_type& __c1, const char_type& __c2) { } - - static bool - eq(const char_type& __c1, const char_type& __c2) { return true; } - - static bool - lt(const char_type& __c1, const char_type& __c2) { return true; } - - static int - compare(const char_type* __s1, const char_type* __s2, size_t __n) - { return 0; } - - static size_t - length(const char_type* __s) { return 0; } - - static const char_type* - find(const char_type* __s, size_t __n, const char_type& __a) - { return __s; } - - static char_type* - move(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - copy(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - assign(char_type* __s, size_t __n, char_type __a) - { return __s; } - - static char_type - to_char_type(const int_type& __c) - { return char_type(); } - - static int_type - to_int_type(const char_type& __c) - { return int_type(); } - - static bool - eq_int_type(const int_type& __c1, const int_type& __c2) - { return true; } - - static int_type - eof() - { return int_type(); } - - static int_type - not_eof(const int_type& __c) - { return int_type(); } -}; - void test07() { bool test __attribute__((unused)) = true; - typedef std::basic_ofstream gnu_ofstr; + typedef std::basic_ofstream<__gnu_test::pod_ushort> gnu_ofstr; try { diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/3.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/3.cc index 6b03e8c006e..517176628f3 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/3.cc @@ -1,6 +1,6 @@ // 1999-01-17 bkoz test functionality of basic_filebuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -24,101 +24,14 @@ #include #include - -// { dg-do compile } +#include // libstdc++/2020 // should be able to use custom char_type, custom traits type -class gnu_char_type -{ - unsigned long character; -public: - // operator == - bool - operator==(const gnu_char_type& __lhs) - { return character == __lhs.character; } - - // operator < - bool - operator<(const gnu_char_type& __lhs) - { return character < __lhs.character; } - - // default ctor - gnu_char_type() { } - - // to_char_type - gnu_char_type(const unsigned long& __l) : character(__l) { } - - // to_int_type - operator unsigned long() const { return character; } -}; - -// char_traits specialization -struct gnu_char_traits -{ - typedef gnu_char_type char_type; - typedef long int_type; - typedef long pos_type; - typedef unsigned long off_type; - typedef long state_type; - - static void - assign(char_type& __c1, const char_type& __c2) { } - - static bool - eq(const char_type& __c1, const char_type& __c2) { return true; } - - static bool - lt(const char_type& __c1, const char_type& __c2) { return true; } - - static int - compare(const char_type* __s1, const char_type* __s2, size_t __n) - { return 0; } - - static size_t - length(const char_type* __s) { return 0; } - - static const char_type* - find(const char_type* __s, size_t __n, const char_type& __a) - { return __s; } - - static char_type* - move(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - copy(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - assign(char_type* __s, size_t __n, char_type __a) - { return __s; } - - static char_type - to_char_type(const int_type& __c) - { return char_type(); } - - static int_type - to_int_type(const char_type& __c) - { return int_type(); } - - static bool - eq_int_type(const int_type& __c1, const int_type& __c2) - { return true; } - - static int_type - eof() - { return int_type(); } - - static int_type - not_eof(const int_type& __c) - { return int_type(); } -}; - void test07() { bool test __attribute__((unused)) = true; - typedef std::basic_ostream gnu_ostr; + typedef std::basic_ostream<__gnu_test::pod_ushort> gnu_ostr; try { diff --git a/libstdc++-v3/testsuite/27_io/basic_ostringstream/3.cc b/libstdc++-v3/testsuite/27_io/basic_ostringstream/3.cc index 64d84060ed7..e68ea0eeacd 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostringstream/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostringstream/3.cc @@ -1,6 +1,6 @@ // 1999-01-17 bkoz test functionality of basic_filebuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -24,101 +24,14 @@ #include #include - -// { dg-do compile } +#include // libstdc++/2020 // should be able to use custom char_type, custom traits type -class gnu_char_type -{ - unsigned long character; -public: - // operator == - bool - operator==(const gnu_char_type& __lhs) - { return character == __lhs.character; } - - // operator < - bool - operator<(const gnu_char_type& __lhs) - { return character < __lhs.character; } - - // default ctor - gnu_char_type() { } - - // to_char_type - gnu_char_type(const unsigned long& __l) : character(__l) { } - - // to_int_type - operator unsigned long() const { return character; } -}; - -// char_traits specialization -struct gnu_char_traits -{ - typedef gnu_char_type char_type; - typedef long int_type; - typedef long pos_type; - typedef long off_type; - typedef long state_type; - - static void - assign(char_type& __c1, const char_type& __c2) { } - - static bool - eq(const char_type& __c1, const char_type& __c2) { return true; } - - static bool - lt(const char_type& __c1, const char_type& __c2) { return true; } - - static int - compare(const char_type* __s1, const char_type* __s2, size_t __n) - { return 0; } - - static size_t - length(const char_type* __s) { return 0; } - - static const char_type* - find(const char_type* __s, size_t __n, const char_type& __a) - { return __s; } - - static char_type* - move(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - copy(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - assign(char_type* __s, size_t __n, char_type __a) - { return __s; } - - static char_type - to_char_type(const int_type& __c) - { return char_type(); } - - static int_type - to_int_type(const char_type& __c) - { return int_type(); } - - static bool - eq_int_type(const int_type& __c1, const int_type& __c2) - { return true; } - - static int_type - eof() - { return int_type(); } - - static int_type - not_eof(const int_type& __c) - { return int_type(); } -}; - void test07() { bool test __attribute__((unused)) = true; - typedef std::basic_ostringstream gnu_osstr; + typedef std::basic_ostringstream<__gnu_test::pod_ushort> gnu_osstr; try { diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/3.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/3.cc index d9960e02d4e..765ca167d38 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/3.cc @@ -1,6 +1,6 @@ // 1999-01-17 bkoz test functionality of basic_filebuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -24,96 +24,11 @@ #include #include +#include // libstdc++/2020 // should be able to use custom char_type, custom traits type -class gnu_char_type -{ - unsigned long character; -public: - // operator == - bool - operator==(const gnu_char_type& __lhs) - { return character == __lhs.character; } - - // operator < - bool - operator<(const gnu_char_type& __lhs) - { return character < __lhs.character; } - - // default ctor - gnu_char_type() { } - - // to_char_type - gnu_char_type(const unsigned long& __l) : character(__l) { } - - // to_int_type - operator unsigned long() const { return character; } -}; - -// char_traits specialization -struct gnu_char_traits -{ - typedef gnu_char_type char_type; - typedef long int_type; - typedef long pos_type; - typedef unsigned long off_type; - typedef long state_type; - - static void - assign(char_type& __c1, const char_type& __c2) { } - - static bool - eq(const char_type& __c1, const char_type& __c2) { return true; } - - static bool - lt(const char_type& __c1, const char_type& __c2) { return true; } - - static int - compare(const char_type* __s1, const char_type* __s2, size_t __n) - { return 0; } - - static size_t - length(const char_type* __s) { return 0; } - - static const char_type* - find(const char_type* __s, size_t __n, const char_type& __a) - { return __s; } - - static char_type* - move(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - copy(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - assign(char_type* __s, size_t __n, char_type __a) - { return __s; } - - static char_type - to_char_type(const int_type& __c) - { return char_type(); } - - static int_type - to_int_type(const char_type& __c) - { return int_type(); } - - static bool - eq_int_type(const int_type& __c1, const int_type& __c2) - { return true; } - - static int_type - eof() - { return int_type(); } - - static int_type - not_eof(const int_type& __c) - { return int_type(); } -}; - -class gnu_sbuf: public std::basic_streambuf +class gnu_sbuf: public std::basic_streambuf<__gnu_test::pod_ushort> { }; void test07() diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/3.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/3.cc index 03b410d65a8..ced07b58fae 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/3.cc @@ -1,6 +1,6 @@ // 1999-01-17 bkoz test functionality of basic_filebuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -24,99 +24,14 @@ #include #include +#include // libstdc++/2020 // should be able to use custom char_type, custom traits type -class gnu_char_type -{ - unsigned long character; -public: - // operator == - bool - operator==(const gnu_char_type& __lhs) - { return character == __lhs.character; } - - // operator < - bool - operator<(const gnu_char_type& __lhs) - { return character < __lhs.character; } - - // default ctor - gnu_char_type() { } - - // to_char_type - gnu_char_type(const unsigned long& __l) : character(__l) { } - - // to_int_type - operator unsigned long() const { return character; } -}; - -// char_traits specialization -struct gnu_char_traits -{ - typedef gnu_char_type char_type; - typedef long int_type; - typedef long pos_type; - typedef long off_type; - typedef long state_type; - - static void - assign(char_type& __c1, const char_type& __c2) { } - - static bool - eq(const char_type& __c1, const char_type& __c2) { return true; } - - static bool - lt(const char_type& __c1, const char_type& __c2) { return true; } - - static int - compare(const char_type* __s1, const char_type* __s2, size_t __n) - { return 0; } - - static size_t - length(const char_type* __s) { return 0; } - - static const char_type* - find(const char_type* __s, size_t __n, const char_type& __a) - { return __s; } - - static char_type* - move(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - copy(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - assign(char_type* __s, size_t __n, char_type __a) - { return __s; } - - static char_type - to_char_type(const int_type& __c) - { return char_type(); } - - static int_type - to_int_type(const char_type& __c) - { return int_type(); } - - static bool - eq_int_type(const int_type& __c1, const int_type& __c2) - { return true; } - - static int_type - eof() - { return int_type(); } - - static int_type - not_eof(const int_type& __c) - { return int_type(); } -}; - void test07() { bool test __attribute__((unused)) = true; - typedef std::basic_stringbuf gnu_ssbuf; + typedef std::basic_stringbuf<__gnu_test::pod_ushort> gnu_ssbuf; try { gnu_ssbuf obj; } diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/3.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/3.cc index 56e7f7a7ba9..d47a67a0845 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringstream/3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/3.cc @@ -1,6 +1,6 @@ // 1999-01-17 bkoz test functionality of basic_filebuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -24,101 +24,14 @@ #include #include - -// { dg-do compile } +#include // libstdc++/2020 // should be able to use custom char_type, custom traits type -class gnu_char_type -{ - unsigned long character; -public: - // operator == - bool - operator==(const gnu_char_type& __lhs) - { return character == __lhs.character; } - - // operator < - bool - operator<(const gnu_char_type& __lhs) - { return character < __lhs.character; } - - // default ctor - gnu_char_type() { } - - // to_char_type - gnu_char_type(const unsigned long& __l) : character(__l) { } - - // to_int_type - operator unsigned long() const { return character; } -}; - -// char_traits specialization -struct gnu_char_traits -{ - typedef gnu_char_type char_type; - typedef long int_type; - typedef long pos_type; - typedef long off_type; - typedef long state_type; - - static void - assign(char_type& __c1, const char_type& __c2) { } - - static bool - eq(const char_type& __c1, const char_type& __c2) { return true; } - - static bool - lt(const char_type& __c1, const char_type& __c2) { return true; } - - static int - compare(const char_type* __s1, const char_type* __s2, size_t __n) - { return 0; } - - static size_t - length(const char_type* __s) { return 0; } - - static const char_type* - find(const char_type* __s, size_t __n, const char_type& __a) - { return __s; } - - static char_type* - move(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - copy(char_type* __s1, const char_type* __s2, size_t __n) - { return __s1; } - - static char_type* - assign(char_type* __s, size_t __n, char_type __a) - { return __s; } - - static char_type - to_char_type(const int_type& __c) - { return char_type(); } - - static int_type - to_int_type(const char_type& __c) - { return int_type(); } - - static bool - eq_int_type(const int_type& __c1, const int_type& __c2) - { return true; } - - static int_type - eof() - { return int_type(); } - - static int_type - not_eof(const int_type& __c) - { return int_type(); } -}; - void test07() { bool test __attribute__((unused)) = true; - typedef std::basic_stringstream gnu_sstr; + typedef std::basic_stringstream<__gnu_test::pod_ushort> gnu_sstr; try { -- 2.30.2