From 8b34d6c2bfcf7e70d3ab0909cb73ba347f47160e Mon Sep 17 00:00:00 2001
From: Joseph Myers <joseph@codesourcery.com>
Date: Fri, 6 Jun 2008 16:03:52 +0100
Subject: [PATCH] all.cc, [...]: Only include <ext/codecvt_specializations.h>
 and <ext/enc_filebuf.h> if...

	* testsuite/17_intro/headers/all.cc,
	testsuite/17_intro/headers/all_c++200x_compatibility.cc,
	testsuite/17_intro/headers/all_pedantic_errors.cc,
	testsuite/ext/headers.cc: Only include
	<ext/codecvt_specializations.h> and <ext/enc_filebuf.h> if
	_GLIBCXX_HAVE_ICONV.

From-SVN: r136485
---
 libstdc++-v3/ChangeLog                                   | 9 +++++++++
 libstdc++-v3/testsuite/17_intro/headers/all.cc           | 4 ++++
 .../17_intro/headers/all_c++200x_compatibility.cc        | 4 ++++
 .../testsuite/17_intro/headers/all_pedantic_errors.cc    | 4 ++++
 libstdc++-v3/testsuite/ext/headers.cc                    | 4 ++++
 5 files changed, 25 insertions(+)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0f2e56c57a7..5f720d819bc 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* testsuite/17_intro/headers/all.cc,
+	testsuite/17_intro/headers/all_c++200x_compatibility.cc,
+	testsuite/17_intro/headers/all_pedantic_errors.cc,
+	testsuite/ext/headers.cc: Only include
+	<ext/codecvt_specializations.h> and <ext/enc_filebuf.h> if
+	_GLIBCXX_HAVE_ICONV.
+
 2008-06-05  Johannes Singler  <singler@ira.uka.de>
 
         * include/parallel/random_shuffle.h:
diff --git a/libstdc++-v3/testsuite/17_intro/headers/all.cc b/libstdc++-v3/testsuite/17_intro/headers/all.cc
index 662bad6b10f..706e4cf0266 100644
--- a/libstdc++-v3/testsuite/17_intro/headers/all.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/all.cc
@@ -112,10 +112,14 @@
 #include <ext/array_allocator.h>
 #include <ext/atomicity.h>
 #include <ext/bitmap_allocator.h>
+#if _GLIBCXX_HAVE_ICONV
 #include <ext/codecvt_specializations.h>
+#endif
 #include <ext/concurrence.h>
 #include <ext/debug_allocator.h>
+#if _GLIBCXX_HAVE_ICONV
 #include <ext/enc_filebuf.h>
+#endif
 #include <ext/functional>
 #include <ext/iterator>
 #include <ext/malloc_allocator.h>
diff --git a/libstdc++-v3/testsuite/17_intro/headers/all_c++200x_compatibility.cc b/libstdc++-v3/testsuite/17_intro/headers/all_c++200x_compatibility.cc
index 9410805a085..9ba46cf976c 100644
--- a/libstdc++-v3/testsuite/17_intro/headers/all_c++200x_compatibility.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/all_c++200x_compatibility.cc
@@ -113,10 +113,14 @@
 #include <ext/array_allocator.h>
 #include <ext/atomicity.h>
 #include <ext/bitmap_allocator.h>
+#if _GLIBCXX_HAVE_ICONV
 #include <ext/codecvt_specializations.h>
+#endif
 #include <ext/concurrence.h>
 #include <ext/debug_allocator.h>
+#if _GLIBCXX_HAVE_ICONV
 #include <ext/enc_filebuf.h>
+#endif
 #include <ext/functional>
 #include <ext/iterator>
 #include <ext/malloc_allocator.h>
diff --git a/libstdc++-v3/testsuite/17_intro/headers/all_pedantic_errors.cc b/libstdc++-v3/testsuite/17_intro/headers/all_pedantic_errors.cc
index 2b72a3928a5..955afef6515 100644
--- a/libstdc++-v3/testsuite/17_intro/headers/all_pedantic_errors.cc
+++ b/libstdc++-v3/testsuite/17_intro/headers/all_pedantic_errors.cc
@@ -113,10 +113,14 @@
 #include <ext/array_allocator.h>
 #include <ext/atomicity.h>
 #include <ext/bitmap_allocator.h>
+#if _GLIBCXX_HAVE_ICONV
 #include <ext/codecvt_specializations.h>
+#endif
 #include <ext/concurrence.h>
 #include <ext/debug_allocator.h>
+#if _GLIBCXX_HAVE_ICONV
 #include <ext/enc_filebuf.h>
+#endif
 #include <ext/functional>
 #include <ext/iterator>
 #include <ext/malloc_allocator.h>
diff --git a/libstdc++-v3/testsuite/ext/headers.cc b/libstdc++-v3/testsuite/ext/headers.cc
index a1bdbb350f5..d4c079eb525 100644
--- a/libstdc++-v3/testsuite/ext/headers.cc
+++ b/libstdc++-v3/testsuite/ext/headers.cc
@@ -28,10 +28,14 @@
 #include <ext/array_allocator.h>
 #include <ext/atomicity.h>
 #include <ext/bitmap_allocator.h>
+#if _GLIBCXX_HAVE_ICONV
 #include <ext/codecvt_specializations.h>
+#endif
 #include <ext/concurrence.h>
 #include <ext/debug_allocator.h>
+#if _GLIBCXX_HAVE_ICONV
 #include <ext/enc_filebuf.h>
+#endif
 #include <ext/functional>
 #include <ext/iterator>
 #include <ext/malloc_allocator.h>
-- 
2.30.2