3.cc: Fixed type mismatches in explicit instantiations.

2007-02-22  Simon Martin  <simartin@users.sourceforge.net>

	* testsuite/27_io/basic_ios/cons/char/3.cc: Fixed type mismatches in
	explicit instantiations.
	* testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Likewise.
	* testsuite/27_io/basic_istream/extractors_arithmetic/pod/3983-1.cc:
	Likewise.
	* testsuite/27_io/basic_istream/extractors_character/pod/3983-2.cc:
	Likewise.
	* testsuite/27_io/basic_istream/sentry/pod/1.cc: Likewise.
	* testsuite/27_io/basic_ostream/sentry/pod/1.cc: Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/pod/10081-in.cc:
	Likewise.
	* testsuite/21_strings/basic_string/inserters_extractors/pod/10081-out.cc:
	Likewise.
	* testsuite/21_strings/basic_string/capacity/1.cc: Likewise.

From-SVN: r122237

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8188bb7fefa8ca14cb4da54b6c07091971c511ba..8956610c3e2ac44dc2ade10a2b2b2108949f128b 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,20 @@
+2007-02-22  Simon Martin  <simartin@users.sourceforge.net>
+
+       * testsuite/27_io/basic_ios/cons/char/3.cc: Fixed type mismatches in
+       explicit instantiations.
+       * testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc: Likewise.
+       * testsuite/27_io/basic_istream/extractors_arithmetic/pod/3983-1.cc:
+       Likewise.
+       * testsuite/27_io/basic_istream/extractors_character/pod/3983-2.cc:
+       Likewise.
+       * testsuite/27_io/basic_istream/sentry/pod/1.cc: Likewise.
+       * testsuite/27_io/basic_ostream/sentry/pod/1.cc: Likewise.
+       * testsuite/21_strings/basic_string/inserters_extractors/pod/10081-in.cc:
+       Likewise.
+       * testsuite/21_strings/basic_string/inserters_extractors/pod/10081-out.cc:
+       Likewise.
+       * testsuite/21_strings/basic_string/capacity/1.cc: Likewise.
+
 2007-02-22  Paolo Carlini  <pcarlini@suse.de>
 
        * include/tr1/unordered_map (class __unordered_map,

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/1.cc
index 3ea346996c391d1e3e3718568bf649c137db9258..70b25ed862417e5f548581372cad0ca94c5ffc35 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/capacity/1.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/capacity/1.cc
@@ -184,11 +184,11 @@ void test01()
 #if !__GXX_WEAK__
 // Explicitly instantiate for systems with no COMDAT or weak support.
 template 
-  std::basic_string< A<B> >::size_type 
+  const std::basic_string< A<B> >::size_type 
   std::basic_string< A<B> >::_Rep::_S_max_size;
 
 template 
-  A<B>
+  const A<B>
   std::basic_string< A<B> >::_Rep::_S_terminal;
 #endif
 

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/pod/10081-in.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/pod/10081-in.cc
index 1abd09f9aa3031860041b774385c5282484b787a..1e5d4fe79bd6232b08ce60898a4bc4bf974b78b3 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/pod/10081-in.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/pod/10081-in.cc
@@ -76,11 +76,11 @@ void test01()
 #if !__GXX_WEAK__
 // Explicitly instantiate for systems with no COMDAT or weak support.
 template 
-  std::basic_string<__gnu_test::pod_ushort>::size_type 
+  const std::basic_string<__gnu_test::pod_ushort>::size_type 
   std::basic_string<__gnu_test::pod_ushort>::_Rep::_S_max_size;
 
 template 
-  __gnu_test::pod_ushort
+  const __gnu_test::pod_ushort
   std::basic_string<__gnu_test::pod_ushort>::_Rep::_S_terminal;
 #endif
 

diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/pod/10081-out.cc b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/pod/10081-out.cc
index efa44775daafb98821cec4e25af97ca5127ff2b1..83d320a9d0d9d436b78c5b3b15c72582a53124a0 100644 (file)
--- a/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/pod/10081-out.cc
+++ b/libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/pod/10081-out.cc
@@ -76,11 +76,11 @@ void test01()
 #if !__GXX_WEAK__
 // Explicitly instantiate for systems with no COMDAT or weak support.
 template 
-  std::basic_string<__gnu_test::pod_ushort>::size_type 
+  const std::basic_string<__gnu_test::pod_ushort>::size_type 
   std::basic_string<__gnu_test::pod_ushort>::_Rep::_S_max_size;
 
 template 
-  __gnu_test::pod_ushort
+  const __gnu_test::pod_ushort
   std::basic_string<__gnu_test::pod_ushort>::_Rep::_S_terminal;
 #endif
 

diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/cons/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_ios/cons/char/3.cc
index d55d6ad46c7205e56ae7d589907c71337aeb6fab..39f69e5217a47c6aba1bef3d2e470a34ecb4b31d 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ios/cons/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ios/cons/char/3.cc
@@ -160,11 +160,11 @@ void test02()
 #if !__GXX_WEAK__
 // Explicitly instantiate for systems with no COMDAT or weak support.
 template 
-  std::basic_string<unsigned short>::size_type 
+  const std::basic_string<unsigned short>::size_type 
   std::basic_string<unsigned short>::_Rep::_S_max_size;
 
 template 
-  unsigned short
+  const unsigned short
   std::basic_string<unsigned short>::_Rep::_S_terminal;
 #endif
 

diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/pod/3983-1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/pod/3983-1.cc
index f02acb04650619295898b7da2ba0682649d9ce63..6c3f4f8b307b25d23bd37e86b9be356553164ad2 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/pod/3983-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_arithmetic/pod/3983-1.cc
@@ -62,11 +62,11 @@ void test03()
 #if !__GXX_WEAK__
 // Explicitly instantiate for systems with no COMDAT or weak support.
 template 
-  std::basic_string<__gnu_test::pod_ushort>::size_type 
+  const std::basic_string<__gnu_test::pod_ushort>::size_type 
   std::basic_string<__gnu_test::pod_ushort>::_Rep::_S_max_size;
 
 template 
-  __gnu_test::pod_ushort
+  const __gnu_test::pod_ushort
   std::basic_string<__gnu_test::pod_ushort>::_Rep::_S_terminal;
 #endif
 

diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/pod/3983-2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/pod/3983-2.cc
index 6ea523553eb0c6dabcc36f55241ad4ace0adfa31..7a979be7d38f21a24f4325d857b7c2026c81c8aa 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/pod/3983-2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/pod/3983-2.cc
@@ -66,11 +66,11 @@ void test03()
 #if !__GXX_WEAK__
 // Explicitly instantiate for systems with no COMDAT or weak support.
 template 
-  std::basic_string<__gnu_test::pod_ushort>::size_type 
+  const std::basic_string<__gnu_test::pod_ushort>::size_type 
   std::basic_string<__gnu_test::pod_ushort>::_Rep::_S_max_size;
 
 template 
-  __gnu_test::pod_ushort
+  const __gnu_test::pod_ushort
   std::basic_string<__gnu_test::pod_ushort>::_Rep::_S_terminal;
 #endif
 

diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc
index eaeeb4322c9bca87c7edbfccf29f789787a523be..b39f51730af0acc735aaca344eb46f7297e71620 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/pod/3983-3.cc
@@ -61,11 +61,11 @@ void test03()
 #if !__GXX_WEAK__
 // Explicitly instantiate for systems with no COMDAT or weak support.
 template 
-  std::basic_string<__gnu_test::pod_ushort>::size_type 
+  const std::basic_string<__gnu_test::pod_ushort>::size_type 
   std::basic_string<__gnu_test::pod_ushort>::_Rep::_S_max_size;
 
 template 
-  __gnu_test::pod_ushort
+  const __gnu_test::pod_ushort
   std::basic_string<__gnu_test::pod_ushort>::_Rep::_S_terminal;
 #endif
 

diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/pod/1.cc b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/pod/1.cc
index 15b7e8b8f35cecc49b47158b1dcde86b89524dc9..21c51d12ec810704941f88384bfe2dd4e85519f3 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/pod/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/pod/1.cc
@@ -158,11 +158,11 @@ void test01()
 #if !__GXX_WEAK__
 // Explicitly instantiate for systems with no COMDAT or weak support.
 template 
-  std::basic_string<__gnu_test::pod_ushort>::size_type 
+  const std::basic_string<__gnu_test::pod_ushort>::size_type 
   std::basic_string<__gnu_test::pod_ushort>::_Rep::_S_max_size;
 
 template 
-  __gnu_test::pod_ushort
+  const __gnu_test::pod_ushort
   std::basic_string<__gnu_test::pod_ushort>::_Rep::_S_terminal;
 #endif
 

diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/pod/1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/pod/1.cc
index 7cad09fa695babb6a9fff6e12aff49d3b8a9cac3..b3f4a7e8aa7f3b16d1029f640f126ba113583ad0 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/pod/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/sentry/pod/1.cc
@@ -114,11 +114,11 @@ void test01()
 #if !__GXX_WEAK__
 // Explicitly instantiate for systems with no COMDAT or weak support.
 template 
-  std::basic_string<__gnu_test::pod_ushort>::size_type 
+  const std::basic_string<__gnu_test::pod_ushort>::size_type 
   std::basic_string<__gnu_test::pod_ushort>::_Rep::_S_max_size;
 
 template 
-  __gnu_test::pod_ushort
+  const __gnu_test::pod_ushort
   std::basic_string<__gnu_test::pod_ushort>::_Rep::_S_terminal;
 #endif