aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Kosnik <bkoz@redhat.com>2007-02-06 17:59:09 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2007-02-06 17:59:09 +0000
commitbdbccd1c53daa50a5526f5a3f5a71ede72fc2efc (patch)
tree81bfd366ba516904f4308b04541b9e85eaaf1e89
parentc1fdb0821a6a51f24f60d45a9f4af4d90adf4659 (diff)
downloadgcc-bdbccd1c53daa50a5526f5a3f5a71ede72fc2efc.zip
gcc-bdbccd1c53daa50a5526f5a3f5a71ede72fc2efc.tar.gz
gcc-bdbccd1c53daa50a5526f5a3f5a71ede72fc2efc.tar.bz2
extc++.h: Guard include files that assume iconv support is present from precompilation...
2007-02-06 Benjamin Kosnik <bkoz@redhat.com> Marco Trudel <mtrudel@gmx.ch> * include/precompiled/extc++.h: Guard include files that assume iconv support is present from precompilation via _GLIBCXX_HAVE_ICONV. Co-Authored-By: Marco Trudel <mtrudel@gmx.ch> From-SVN: r121655
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/include/precompiled/extc++.h7
2 files changed, 11 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bad5280..67acc42 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-06 Benjamin Kosnik <bkoz@redhat.com>
+ Marco Trudel <mtrudel@gmx.ch>
+
+ * include/precompiled/extc++.h: Don't precompile include files
+ that assume iconv support is present.
+
2007-02-05 Paolo Carlini <pcarlini@suse.de>
* include/bits/stl_deque.h (operator<): Qualify call.
diff --git a/libstdc++-v3/include/precompiled/extc++.h b/libstdc++-v3/include/precompiled/extc++.h
index f3cd662..7e8ef02 100644
--- a/libstdc++-v3/include/precompiled/extc++.h
+++ b/libstdc++-v3/include/precompiled/extc++.h
@@ -37,10 +37,8 @@
#include <ext/array_allocator.h>
#include <ext/atomicity.h>
#include <ext/bitmap_allocator.h>
-#include <ext/codecvt_specializations.h>
#include <ext/concurrence.h>
#include <ext/debug_allocator.h>
-#include <ext/enc_filebuf.h>
#include <ext/functional>
#include <ext/hash_map>
#include <ext/hash_set>
@@ -68,3 +66,8 @@
#include <ext/pb_ds/list_update_policy.hpp>
#include <ext/pb_ds/tree_policy.hpp>
#include <ext/pb_ds/trie_policy.hpp>
+
+#ifdef _GLIBCXX_HAVE_ICONV
+ #include <ext/codecvt_specializations.h>
+ #include <ext/enc_filebuf.h>
+#endif