* 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@136485 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0f2e56c..5f720d8 100644 (file)
--- 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 662bad6..706e4cf 100644 (file)
--- 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 9410805..9ba46cf 100644 (file)
--- 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 2b72a39..955afef 100644 (file)
--- 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 a1bdbb3..d4c079e 100644 (file)
--- 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>