diff options
| author | Jason Merrill <jason@redhat.com> | 2007-05-08 02:50:32 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2007-05-08 02:50:32 -0400 |
| commit | fba10f59ff91d320e2466a158816c47ae8a25c65 (patch) | |
| tree | 77b7f196ade1cff1541402dea2bac451bf77399c /libstdc++-v3/include | |
| parent | ac97d816a6cbc700f4808223e21d6bdb50e4dd66 (diff) | |
| download | gcc-fba10f59ff91d320e2466a158816c47ae8a25c65.zip gcc-fba10f59ff91d320e2466a158816c47ae8a25c65.tar.gz gcc-fba10f59ff91d320e2466a158816c47ae8a25c65.tar.bz2 | |
cxxabi-internal.h: Remove, to be replaced by...
* libsupc++/cxxabi-internal.h: Remove, to be replaced by...
* libsupc++/cxxabi-forced.h: ...this new file.
* include/ext/vstring.tcc: Include cxxabi-forced.h instead.
* include/bits/istream.tcc: Likewise.
* include/bits/ostream.tcc: Likewise.
* include/bits/basic_string.tcc: Likewise.
* include/bits/ostream_insert.h: Likewise.
* include/bits/fstream.tcc: Likewise.
* include/std/bitset: Likewise.
* libsupc++/cxxabi.h: Restore previous contents.
* Makefile.am (headers): Add cxxabi-forced.h.
* Makefile.in: Regenerate.
From-SVN: r124539
Diffstat (limited to 'libstdc++-v3/include')
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.tcc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/fstream.tcc | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/istream.tcc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/ostream.tcc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/ostream_insert.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/vstring.tcc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/bitset | 2 |
7 files changed, 9 insertions, 8 deletions
diff --git a/libstdc++-v3/include/bits/basic_string.tcc b/libstdc++-v3/include/bits/basic_string.tcc index 4c68293..062b02b 100644 --- a/libstdc++-v3/include/bits/basic_string.tcc +++ b/libstdc++-v3/include/bits/basic_string.tcc @@ -46,7 +46,7 @@ #pragma GCC system_header -#include <cxxabi-internal.h> +#include <cxxabi-forced.h> _GLIBCXX_BEGIN_NAMESPACE(std) diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc index f9b84bf..2653d6f 100644 --- a/libstdc++-v3/include/bits/fstream.tcc +++ b/libstdc++-v3/include/bits/fstream.tcc @@ -1,6 +1,7 @@ // File based streams -*- C++ -*- -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +// Copyright (C) 1997, 1998, 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 @@ -42,7 +43,7 @@ #pragma GCC system_header -#include <cxxabi-internal.h> +#include <cxxabi-forced.h> _GLIBCXX_BEGIN_NAMESPACE(std) diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc index e6b18cd..2e65b48 100644 --- a/libstdc++-v3/include/bits/istream.tcc +++ b/libstdc++-v3/include/bits/istream.tcc @@ -43,7 +43,7 @@ #pragma GCC system_header -#include <cxxabi-internal.h> +#include <cxxabi-forced.h> _GLIBCXX_BEGIN_NAMESPACE(std) diff --git a/libstdc++-v3/include/bits/ostream.tcc b/libstdc++-v3/include/bits/ostream.tcc index c8bb8f6..06facc0 100644 --- a/libstdc++-v3/include/bits/ostream.tcc +++ b/libstdc++-v3/include/bits/ostream.tcc @@ -43,7 +43,7 @@ #pragma GCC system_header -#include <cxxabi-internal.h> +#include <cxxabi-forced.h> _GLIBCXX_BEGIN_NAMESPACE(std) diff --git a/libstdc++-v3/include/bits/ostream_insert.h b/libstdc++-v3/include/bits/ostream_insert.h index 5815de9..5f63263 100644 --- a/libstdc++-v3/include/bits/ostream_insert.h +++ b/libstdc++-v3/include/bits/ostream_insert.h @@ -38,7 +38,7 @@ #pragma GCC system_header #include <iosfwd> -#include <cxxabi-internal.h> +#include <cxxabi-forced.h> _GLIBCXX_BEGIN_NAMESPACE(std) diff --git a/libstdc++-v3/include/ext/vstring.tcc b/libstdc++-v3/include/ext/vstring.tcc index 7f3478a..8d5b1b5 100644 --- a/libstdc++-v3/include/ext/vstring.tcc +++ b/libstdc++-v3/include/ext/vstring.tcc @@ -38,7 +38,7 @@ #pragma GCC system_header -#include <cxxabi-internal.h> +#include <cxxabi-forced.h> _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset index 09f05e1..61cad28 100644 --- a/libstdc++-v3/include/std/bitset +++ b/libstdc++-v3/include/std/bitset @@ -56,7 +56,7 @@ #include <bits/functexcept.h> // For invalid_argument, out_of_range, // overflow_error #include <iosfwd> -#include <cxxabi-internal.h> +#include <cxxabi-forced.h> #define _GLIBCXX_BITSET_BITS_PER_WORD (__CHAR_BIT__ * sizeof(unsigned long)) #define _GLIBCXX_BITSET_WORDS(__n) \ |