diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2000-12-23 07:13:57 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-12-23 07:13:57 +0000 |
| commit | a40ba78e55a277a4dc5b93f67ad4de0812163a2f (patch) | |
| tree | ffa1846d7c65367ce41a49c90f867e28eed685c6 /libstdc++-v3/libsupc++ | |
| parent | ca5fc74676b641ce6ab62469d1ed72cdcd0ad264 (diff) | |
| download | gcc-a40ba78e55a277a4dc5b93f67ad4de0812163a2f.zip gcc-a40ba78e55a277a4dc5b93f67ad4de0812163a2f.tar.gz gcc-a40ba78e55a277a4dc5b93f67ad4de0812163a2f.tar.bz2 | |
Makefile.am (CSTD_INCLUDES): Change from CSHADOW_INCLUDES.
2000-12-23 Benjamin Kosnik <bkoz@redhat.com>
* src/Makefile.am (CSTD_INCLUDES): Change from CSHADOW_INCLUDES.
(strstream.cc): Add special rule for deprecated files.
* libsupc++/Makefile.am (INCLUDES): Sync.
* acinclude.m4 (GLIBCPP_EXPORT_INCLUDES): And here.
Reported by Fred Fish <fnf@ninemoons.com>
* include/backward/iomanip.h: Remove backward from include
* include/backward/strstream.h: Same.
* include/backward/stream.h: Same.
* include/backward/ostream.h: Same.
* include/backward/istream.h: Same.
* src/strstream.cc: And here.
Reported by Brad Garcia <bgarcia@laurelnetworks.com>
* src/string-inst.cc (_S_find): Use generic template.
* include/bits/string.tcc (_S_find): Remove specializations
From-SVN: r38477
Diffstat (limited to 'libstdc++-v3/libsupc++')
| -rw-r--r-- | libstdc++-v3/libsupc++/Makefile.am | 8 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/Makefile.in | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index 3238685..dfd8a6d 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -65,16 +65,16 @@ WARN_CXXFLAGS = \ # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ -TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ +CSTD_INCLUDES = @CSTD_INCLUDES@ LIBMATH_INCLUDES = @LIBMATH_INCLUDES@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ LIBIO_INCLUDES = @LIBIO_INCLUDES@ -CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ +TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ INCLUDES = \ -I$(top_srcdir)/../gcc -I$(top_srcdir)/../include \ - $(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) \ - $(CONFIG_INCLUDES) -I$(top_builddir)/include + -I$(GLIBCPP_INCLUDE_DIR) $(CSTD_INCLUDES) -I$(top_builddir)/include \ + $(LIBSUPCXX_INCLUDES) headers = \ cxxabi.h exception new typeinfo diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 0c1bb57..b05feb9 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -143,13 +143,13 @@ WARN_CXXFLAGS = @WARN_FLAGS@ $(WERROR) @WFMT_FLAGS@ # Use common includes from acinclude.m4/GLIBCPP_EXPORT_INCLUDES GLIBCPP_INCLUDE_DIR = @GLIBCPP_INCLUDE_DIR@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ -TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ +CSTD_INCLUDES = @CSTD_INCLUDES@ LIBMATH_INCLUDES = @LIBMATH_INCLUDES@ LIBSUPCXX_INCLUDES = @LIBSUPCXX_INCLUDES@ LIBIO_INCLUDES = @LIBIO_INCLUDES@ -CSHADOW_INCLUDES = @CSHADOW_INCLUDES@ +TOPLEVEL_INCLUDES = @TOPLEVEL_INCLUDES@ -INCLUDES = -I$(top_srcdir)/../gcc -I$(top_srcdir)/../include $(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) $(CONFIG_INCLUDES) -I$(top_builddir)/include +INCLUDES = -I$(top_srcdir)/../gcc -I$(top_srcdir)/../include -I$(GLIBCPP_INCLUDE_DIR) $(CSTD_INCLUDES) -I$(top_builddir)/include $(LIBSUPCXX_INCLUDES) headers = cxxabi.h exception new typeinfo |