diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8188bb7fefa..8956610c3e2 100644
--- 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 3ea346996c3..70b25ed8624 100644
--- 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 1abd09f9aa3..1e5d4fe79bd 100644
--- 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 efa44775daa..83d320a9d0d 100644
--- 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 d55d6ad46c7..39f69e5217a 100644
--- 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 f02acb04650..6c3f4f8b307 100644
--- 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 6ea523553eb..7a979be7d38 100644
--- 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 eaeeb4322c9..b39f51730af 100644
--- 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 15b7e8b8f35..21c51d12ec8 100644
--- 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 7cad09fa695..b3f4a7e8aa7 100644
--- 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