This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
Re: [Patch] Move pback members from basic_streambuf to basic_filebuf
Andreas Tobler wrote:
I'll have a short break and test when I'm back.
Ok, this time is for real ;-)
Please Andreas test the below. Thanks!
Paolo.
//////////
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/3.cc libstdc++-v3/testsuite/27_io/basic_filebuf/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/3.cc 2003-04-10 09:15:27.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/3.cc 2003-04-23 20:37:37.000000000 +0200
@@ -130,8 +130,8 @@
#if !__GXX_WEAK__
// Explicitly instantiate for systems with no COMDAT or weak support.
template
- std::basic_streambuf<gnu_char_type>::int_type
- std::basic_streambuf<gnu_char_type>::_S_pback_size;
+ std::basic_filebuf<gnu_char_type>::int_type
+ std::basic_filebuf<gnu_char_type>::_S_pback_size;
#endif
int main()
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_fstream/3.cc libstdc++-v3/testsuite/27_io/basic_fstream/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_fstream/3.cc 2003-04-10 09:15:29.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_fstream/3.cc 2003-04-23 20:40:29.000000000 +0200
@@ -134,8 +134,8 @@
#if !__GXX_WEAK__
// Explicitly instantiate for systems with no COMDAT or weak support.
template
- std::basic_streambuf<gnu_char_type>::int_type
- std::basic_streambuf<gnu_char_type>::_S_pback_size;
+ std::basic_filebuf<gnu_char_type>::int_type
+ std::basic_filebuf<gnu_char_type>::_S_pback_size;
#endif
int main()
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ifstream/3.cc libstdc++-v3/testsuite/27_io/basic_ifstream/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ifstream/3.cc 2003-04-10 09:15:29.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ifstream/3.cc 2003-04-23 20:41:00.000000000 +0200
@@ -134,8 +134,8 @@
#if !__GXX_WEAK__
// Explicitly instantiate for systems with no COMDAT or weak support.
template
- std::basic_streambuf<gnu_char_type>::int_type
- std::basic_streambuf<gnu_char_type>::_S_pback_size;
+ std::basic_filebuf<gnu_char_type>::int_type
+ std::basic_filebuf<gnu_char_type>::_S_pback_size;
#endif
int main()
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ios/3.cc libstdc++-v3/testsuite/27_io/basic_ios/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ios/3.cc 2003-04-10 09:15:29.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ios/3.cc 2003-04-23 20:41:44.000000000 +0200
@@ -129,13 +129,6 @@
}
}
-#if !__GXX_WEAK__
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template
- std::basic_streambuf<gnu_char_type>::int_type
- std::basic_streambuf<gnu_char_type>::_S_pback_size;
-#endif
-
int main()
{
test07();
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_iostream/3.cc libstdc++-v3/testsuite/27_io/basic_iostream/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_iostream/3.cc 2003-04-10 09:15:30.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_iostream/3.cc 2003-04-23 20:42:01.000000000 +0200
@@ -131,13 +131,6 @@
}
}
-#if !__GXX_WEAK__
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template
- std::basic_streambuf<gnu_char_type>::int_type
- std::basic_streambuf<gnu_char_type>::_S_pback_size;
-#endif
-
int main()
{
test07();
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/3.cc libstdc++-v3/testsuite/27_io/basic_istream/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/3.cc 2003-04-10 09:15:30.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/3.cc 2003-04-23 20:42:27.000000000 +0200
@@ -129,13 +129,6 @@
}
}
-#if !__GXX_WEAK__
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template
- std::basic_streambuf<gnu_char_type>::int_type
- std::basic_streambuf<gnu_char_type>::_S_pback_size;
-#endif
-
int main()
{
test07();
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istream/sentry/char/3983-fstream.cc libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/3983-fstream.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istream/sentry/char/3983-fstream.cc 2003-04-12 23:13:12.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istream/sentry/char/3983-fstream.cc 2003-04-23 20:42:58.000000000 +0200
@@ -182,8 +182,8 @@
std::basic_string<unsigned char>::_Rep::_S_terminal;
template
- std::basic_streambuf<unsigned char>::int_type
- std::basic_streambuf<unsigned char>::_S_pback_size;
+ std::basic_filebuf<unsigned char>::int_type
+ std::basic_filebuf<unsigned char>::_S_pback_size;
#endif
int main()
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_istringstream/3.cc libstdc++-v3/testsuite/27_io/basic_istringstream/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_istringstream/3.cc 2003-04-10 09:15:32.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_istringstream/3.cc 2003-04-23 20:43:29.000000000 +0200
@@ -131,13 +131,6 @@
}
}
-#if !__GXX_WEAK__
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template
- std::basic_streambuf<gnu_char_type>::int_type
- std::basic_streambuf<gnu_char_type>::_S_pback_size;
-#endif
-
int main()
{
test07();
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ofstream/3.cc libstdc++-v3/testsuite/27_io/basic_ofstream/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ofstream/3.cc 2003-04-10 09:15:32.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ofstream/3.cc 2003-04-23 20:43:47.000000000 +0200
@@ -134,8 +134,8 @@
#if !__GXX_WEAK__
// Explicitly instantiate for systems with no COMDAT or weak support.
template
- std::basic_streambuf<gnu_char_type>::int_type
- std::basic_streambuf<gnu_char_type>::_S_pback_size;
+ std::basic_filebuf<gnu_char_type>::int_type
+ std::basic_filebuf<gnu_char_type>::_S_pback_size;
#endif
int main()
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/3.cc libstdc++-v3/testsuite/27_io/basic_ostream/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/3.cc 2003-04-10 09:15:33.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/3.cc 2003-04-23 20:44:20.000000000 +0200
@@ -131,13 +131,6 @@
}
}
-#if !__GXX_WEAK__
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template
- std::basic_streambuf<gnu_char_type>::int_type
- std::basic_streambuf<gnu_char_type>::_S_pback_size;
-#endif
-
int main()
{
test07();
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ostream/sentry/char/3983-fstream.cc libstdc++-v3/testsuite/27_io/basic_ostream/sentry/char/3983-fstream.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostream/sentry/char/3983-fstream.cc 2003-04-12 23:13:12.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostream/sentry/char/3983-fstream.cc 2003-04-23 20:44:40.000000000 +0200
@@ -153,8 +153,8 @@
std::basic_string<unsigned char>::_Rep::_S_terminal;
template
- std::basic_streambuf<unsigned char>::int_type
- std::basic_streambuf<unsigned char>::_S_pback_size;
+ std::basic_filebuf<unsigned char>::int_type
+ std::basic_filebuf<unsigned char>::_S_pback_size;
#endif
int main()
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_ostringstream/3.cc libstdc++-v3/testsuite/27_io/basic_ostringstream/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_ostringstream/3.cc 2003-04-10 09:15:34.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_ostringstream/3.cc 2003-04-23 20:45:39.000000000 +0200
@@ -131,13 +131,6 @@
}
}
-#if !__GXX_WEAK__
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template
- std::basic_streambuf<gnu_char_type>::int_type
- std::basic_streambuf<gnu_char_type>::_S_pback_size;
-#endif
-
int main()
{
test07();
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_streambuf/3.cc libstdc++-v3/testsuite/27_io/basic_streambuf/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_streambuf/3.cc 2003-04-10 09:15:35.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_streambuf/3.cc 2003-04-23 20:45:57.000000000 +0200
@@ -132,8 +132,8 @@
#if !__GXX_WEAK__
// Explicitly instantiate for systems with no COMDAT or weak support.
template
- std::basic_streambuf<gnu_char_type>::int_type
- std::basic_streambuf<gnu_char_type>::_S_pback_size;
+ std::basic_filebuf<gnu_char_type>::int_type
+ std::basic_filebuf<gnu_char_type>::_S_pback_size;
#endif
int main()
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_stringbuf/3.cc libstdc++-v3/testsuite/27_io/basic_stringbuf/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_stringbuf/3.cc 2003-04-10 09:15:36.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_stringbuf/3.cc 2003-04-23 20:46:21.000000000 +0200
@@ -127,13 +127,6 @@
}
}
-#if !__GXX_WEAK__
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template
- std::basic_streambuf<gnu_char_type>::int_type
- std::basic_streambuf<gnu_char_type>::_S_pback_size;
-#endif
-
int main()
{
test07();
diff -urN libstdc++-v3-orig/testsuite/27_io/basic_stringstream/3.cc libstdc++-v3/testsuite/27_io/basic_stringstream/3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_stringstream/3.cc 2003-04-10 09:15:38.000000000 +0200
+++ libstdc++-v3/testsuite/27_io/basic_stringstream/3.cc 2003-04-23 20:46:44.000000000 +0200
@@ -131,13 +131,6 @@
}
}
-#if !__GXX_WEAK__
-// Explicitly instantiate for systems with no COMDAT or weak support.
-template
- std::basic_streambuf<gnu_char_type>::int_type
- std::basic_streambuf<gnu_char_type>::_S_pback_size;
-#endif
-
int main()
{
test07();