locale_facets.tcc: Do not include <typeinfo>.

2007-04-22  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/locale_facets.tcc: Do not include <typeinfo>.
	* testsuite/27_io/basic_ios/imbue/14072.cc: Do it here.
	* testsuite/27_io/basic_ios/cons/char/3.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/22_locale/locale/cons/2.cc: Likewise.
	* testsuite/22_locale/locale/cons/unicode.cc: Likewise.
	* testsuite/22_locale/numpunct/members/pod/2.cc: Likewise.
	* testsuite/22_locale/global_templates/1.cc: Likewise.

From-SVN: r124039

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7d37f3fa2874c3fcc6412160cc98bb46ddfd0f03..045fa34c1de6dc937655907d4b06c58794b6e92f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,19 @@
+2007-04-22  Paolo Carlini  <pcarlini@suse.de>
+
+       * include/bits/locale_facets.tcc: Do not include <typeinfo>.
+       * testsuite/27_io/basic_ios/imbue/14072.cc: Do it here.
+       * testsuite/27_io/basic_ios/cons/char/3.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/22_locale/locale/cons/2.cc: Likewise.
+       * testsuite/22_locale/locale/cons/unicode.cc: Likewise.
+       * testsuite/22_locale/numpunct/members/pod/2.cc: Likewise.
+       * testsuite/22_locale/global_templates/1.cc: Likewise.
+
 2007-04-19  Joseph Myers  <joseph@codesourcery.com>
 
        * configure.ac: Allow both powerpc*-*-linux* and powerpc*-*-gnu*

diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc
index 42cf1b04ff1821a7641a0bd1a1aa461cbc6a05e0..a53f2643501f434c2fcb36cbcf20157eacc50413 100644 (file)
--- a/libstdc++-v3/include/bits/locale_facets.tcc
+++ b/libstdc++-v3/include/bits/locale_facets.tcc
@@ -39,10 +39,9 @@
 
 #pragma GCC system_header
 
+#include <ext/type_traits.h>
 #include <ext/numeric_traits.h>
-#include <typeinfo>            // For bad_cast.
 #include <bits/streambuf_iterator.h>
-#include <ext/type_traits.h>
 
 _GLIBCXX_BEGIN_NAMESPACE(std)
 

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 1e5d4fe79bd6232b08ce60898a4bc4bf974b78b3..816542a75d0f3f193d8ed6845e7548c8b3ba8cc4 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
@@ -1,4 +1,4 @@
-// Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -31,6 +31,7 @@
 #include <istream>
 #include <sstream>
 #include <locale>
+#include <typeinfo>
 #include <testsuite_hooks.h>
 #include <testsuite_character.h>
 

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 83d320a9d0d9d436b78c5b3b15c72582a53124a0..f8c33b30cc34e4d33c682347ec20b66d1e29231f 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
@@ -1,4 +1,4 @@
-// Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -31,6 +31,7 @@
 #include <ostream>
 #include <sstream>
 #include <locale>
+#include <typeinfo>
 #include <testsuite_hooks.h>
 #include <testsuite_character.h>
 

diff --git a/libstdc++-v3/testsuite/22_locale/global_templates/1.cc b/libstdc++-v3/testsuite/22_locale/global_templates/1.cc
index a3aa40fb5fcd89790b0f20aaba22ed91039fdd1c..87f9de879e760dcaf2221a3ddcd8c0ea60da2706 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/global_templates/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/global_templates/1.cc
@@ -1,6 +1,7 @@
 // 2000-09-11 Benjamin Kosnik <bkoz@redhat.com>
 
-// Copyright (C) 2000 Free Software Foundation
+// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+// Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -22,6 +23,7 @@
 
 #include <cwchar> // for mbstate_t
 #include <locale>
+#include <typeinfo>
 #include <testsuite_hooks.h>
 
 typedef std::codecvt<char, char, std::mbstate_t> ccodecvt;

diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc
index 9b2acb3645f00e792b254815b9092b0b243518c3..7d54330131c586bcc89ada68bcbbbef570999d8f 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc
@@ -2,7 +2,7 @@
 
 // 2000-09-13 Benjamin Kosnik <bkoz@redhat.com>
 
-// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+// Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 // Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -26,6 +26,7 @@
 #include <cwchar> // for mbstate_t
 #include <locale>
 #include <stdexcept>
+#include <typeinfo>
 #include <testsuite_hooks.h>
 
 typedef std::codecvt<char, char, std::mbstate_t>             c_codecvt;

diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc
index 95f1f9d176d9ebecd4ec74ec192d9d187610ca7a..b8b00a3f19c1be58031f27c9dcfa9f0eb644a4d0 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc
@@ -23,6 +23,7 @@
 #include <cwchar> // for mbstate_t
 #include <locale>
 #include <stdexcept>
+#include <typeinfo>
 #include <testsuite_hooks.h>
 #include <ext/codecvt_specializations.h>
 

diff --git a/libstdc++-v3/testsuite/22_locale/numpunct/members/pod/2.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/pod/2.cc
index da332d892f7921adc82f0b2c77e4843ad1ab511b..b8504462a195ee0c535d636791db4db606407471 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/numpunct/members/pod/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/numpunct/members/pod/2.cc
@@ -1,6 +1,6 @@
 // 2003-07-09  Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+// Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -22,6 +22,7 @@
 #include <sstream>
 #include <ostream>
 #include <stdexcept>
+#include <typeinfo>
 #include <testsuite_hooks.h>
 #include <testsuite_character.h>
 

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 39f69e5217a47c6aba1bef3d2e470a34ecb4b31d..ca6ca4f138610eb5913b4bd68135a9b2fa28dfd7 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
@@ -1,6 +1,7 @@
 // 2001-06-05 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -30,6 +31,7 @@
 // 27.4.2.1.6 class ios_base::init
 
 #include <sstream>
+#include <typeinfo>
 #include <testsuite_hooks.h>
 
 // char_traits specialization

diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/imbue/14072.cc b/libstdc++-v3/testsuite/27_io/basic_ios/imbue/14072.cc
index f6b32d1f23d02a0ba18dbc86d012a5c9dd613afc..aa1ce3aaf2d406aef70b2831325335fa756ee279 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ios/imbue/14072.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ios/imbue/14072.cc
@@ -1,6 +1,6 @@
 // 2004-02-09  Petur Runolfsson  <peturr02@ru.is>
 
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -31,7 +31,7 @@
 
 #include <sstream>
 #include <locale>
-
+#include <typeinfo>
 #include <testsuite_hooks.h>
 #include <testsuite_character.h>
 

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 21c51d12ec810704941f88384bfe2dd4e85519f3..16e2ee9fd70e16069cb4ec5553cf5bd291ae3911 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
@@ -1,6 +1,7 @@
 // 1999-10-14 bkoz
 
-// Copyright (C) 1999, 2001, 2003, 2005 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -31,6 +32,7 @@
 
 #include <istream>
 #include <sstream>
+#include <typeinfo>
 #include <ext/pod_char_traits.h>
 #include <testsuite_hooks.h>
 #include <testsuite_character.h>

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 b3f4a7e8aa7f3b16d1029f640f126ba113583ad0..48bc3d62101404d2b2e919a390a89204939b5ee6 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
@@ -1,6 +1,7 @@
 // 1999-10-14 bkoz
 
-// Copyright (C) 1999, 2001, 2003, 2005 Free Software Foundation, Inc.
+// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -31,6 +32,7 @@
 
 #include <ostream>
 #include <sstream>
+#include <typeinfo>
 #include <ext/pod_char_traits.h>
 #include <testsuite_hooks.h>
 #include <testsuite_character.h>