From 66d1b916e29ded5fd678c3fb9359af8da53a1bd7 Mon Sep 17 00:00:00 2001 From: simartin Date: Thu, 22 Feb 2007 20:57:12 +0000 Subject: [PATCH] 2007-02-22 Simon Martin * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122237 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 17 +++++++++++++++++ .../testsuite/21_strings/basic_string/capacity/1.cc | 4 ++-- .../basic_string/inserters_extractors/pod/10081-in.cc | 4 ++-- .../basic_string/inserters_extractors/pod/10081-out.cc | 4 ++-- libstdc++-v3/testsuite/27_io/basic_ios/cons/char/3.cc | 4 ++-- .../basic_istream/extractors_arithmetic/pod/3983-1.cc | 4 ++-- .../basic_istream/extractors_character/pod/3983-2.cc | 4 ++-- .../27_io/basic_istream/extractors_other/pod/3983-3.cc | 4 ++-- .../testsuite/27_io/basic_istream/sentry/pod/1.cc | 4 ++-- .../testsuite/27_io/basic_ostream/sentry/pod/1.cc | 4 ++-- 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 + + * 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 * 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 >::size_type + const std::basic_string< A >::size_type std::basic_string< A >::_Rep::_S_max_size; template - A + const A std::basic_string< A >::_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::size_type + const std::basic_string::size_type std::basic_string::_Rep::_S_max_size; template - unsigned short + const unsigned short std::basic_string::_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 -- 2.7.4