diff options
| author | Simon Martin <simartin@users.sourceforge.net> | 2007-02-22 20:57:12 +0000 |
|---|---|---|
| committer | Simon Martin <simartin@gcc.gnu.org> | 2007-02-22 20:57:12 +0000 |
| commit | 1631cbcfb904f8d3cfb81dde88163248b8f006f9 (patch) | |
| tree | 54ed9633cb27174955bd8ff2a63a7b38d4649516 /libstdc++-v3 | |
| parent | c2143cc185c4f6940677ff8da2d04410ea36869b (diff) | |
| download | gcc-1631cbcfb904f8d3cfb81dde88163248b8f006f9.zip gcc-1631cbcfb904f8d3cfb81dde88163248b8f006f9.tar.gz gcc-1631cbcfb904f8d3cfb81dde88163248b8f006f9.tar.bz2 | |
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
Diffstat (limited to 'libstdc++-v3')
10 files changed, 35 insertions, 18 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8188bb7..8956610 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 3ea3469..70b25ed 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 1abd09f..1e5d4fe 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 efa4477..83d320a 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 d55d6ad..39f69e5 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 f02acb0..6c3f4f8 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 6ea5235..7a979be 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 eaeeb43..b39f517 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 15b7e8b..21c51d1 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 7cad09f..b3f4a7e 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 |