mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2025-01-27 06:44:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[multiple changes]

Browse Source 
2001-03-02  Peter Schmid  <schmid@snake.iap.physik.tu-darmstadt.de>

        * include/bits/istream.tcc: change type of __extracted to __size_type

2001-03-02  Benjamin Kosnik  <bkoz@redhat.com>

	* src/wstring-inst.cc: New file.
	* src/Makefile.am (EXTRA_LTLIBRARIES): Remove.
	(libinst_wstring_la_SOURCES): Remove.
	(libstdc___la_LIBADD): Remove libinst_wstring_la.
	(sources): Add wstring-inst.cc
	* acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPORT): Remove
	libinst_wstring_la.

From-SVN: r40192
This commit is contained in:
Benjamin Kosnik 2001-03-02 21:38:26 +00:00
parent 4737b2745a
commit 4cacbdf21f
12 changed files with 685 additions and 728 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,17 @@
2001-03-02 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
* include/bits/istream.tcc: change type of __extracted to __size_type
2001-03-02 Benjamin Kosnik <bkoz@redhat.com>
* src/wstring-inst.cc: New file.
* src/Makefile.am (EXTRA_LTLIBRARIES): Remove.
(libinst_wstring_la_SOURCES): Remove.
(libstdc___la_LIBADD): Remove libinst_wstring_la.
(sources): Add wstring-inst.cc
* acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPORT): Remove
libinst_wstring_la.
2001-03-02 Peter Schmid <schmid@snake.iap.physik.tu-darmstadt.de>
* src/locale.cc: initialise __ret with zero

1
libstdc++-v3/Makefile.in
View File

@ -110,7 +110,6 @@ glibcpp_toolexecdir = @glibcpp_toolexecdir@
glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
gxx_include_dir = @gxx_include_dir@
ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@
libio_la = @libio_la@
toplevel_srcdir = @toplevel_srcdir@

4
libstdc++-v3/acinclude.m4
View File

@ -852,15 +852,11 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
AC_MSG_CHECKING([for enabled wchar_t specializations])
if test x"$ac_isoC99_wchar_t" = xyes \
&& test x"$ac_XPG2_wchar_t" = xyes; then
libinst_wstring_la="libinst-wstring.la"
AC_DEFINE(_GLIBCPP_USE_WCHAR_T)
AC_MSG_RESULT("yes")
else
libinst_wstring_la=""
AC_MSG_RESULT("no")
fi
AC_SUBST(libinst_wstring_la)
else
dnl Wide characters disabled by the user.
AC_MSG_WARN([wchar_t support disabled.])

4
libstdc++-v3/aclocal.m4 vendored
View File

@ -864,15 +864,11 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
AC_MSG_CHECKING([for enabled wchar_t specializations])
if test x"$ac_isoC99_wchar_t" = xyes \
&& test x"$ac_XPG2_wchar_t" = xyes; then
libinst_wstring_la="libinst-wstring.la"
AC_DEFINE(_GLIBCPP_USE_WCHAR_T)
AC_MSG_RESULT("yes")
else
libinst_wstring_la=""
AC_MSG_RESULT("no")
fi
AC_SUBST(libinst_wstring_la)
else
dnl Wide characters disabled by the user.
AC_MSG_WARN([wchar_t support disabled.])

1317
libstdc++-v3/configure vendored
View File

File diff suppressed because it is too large Load Diff

2
libstdc++-v3/include/bits/istream.tcc
View File

@ -1113,7 +1113,7 @@ namespace std {
typedef typename __istream_type::__ctype_type __ctype_type;
typedef basic_string<_CharT, _Traits, _Alloc> __string_type;
typedef typename __string_type::size_type __size_type;
__int_type __extracted = 0;
__size_type __extracted = 0;
typename __istream_type::sentry __cerb(__in, false);
if (__cerb)

1
libstdc++-v3/libio/Makefile.in
View File

@ -104,7 +104,6 @@ glibcpp_toolexecdir = @glibcpp_toolexecdir@
glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
gxx_include_dir = @gxx_include_dir@
ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@
libio_la = @libio_la@
toplevel_srcdir = @toplevel_srcdir@

1
libstdc++-v3/libmath/Makefile.in
View File

@ -104,7 +104,6 @@ glibcpp_toolexecdir = @glibcpp_toolexecdir@
glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
gxx_include_dir = @gxx_include_dir@
ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@
libio_la = @libio_la@
toplevel_srcdir = @toplevel_srcdir@

1
libstdc++-v3/libsupc++/Makefile.in
View File

@ -101,7 +101,6 @@ glibcpp_toolexecdir = @glibcpp_toolexecdir@
glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
gxx_include_dir = @gxx_include_dir@
ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@
libio_la = @libio_la@
toplevel_srcdir = @toplevel_srcdir@

20
libstdc++-v3/src/Makefile.am
View File

@ -21,7 +21,7 @@
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA.
## $Id: Makefile.am,v 1.75 2001/02/28 03:20:36 bkoz Exp $
## $Id: Makefile.am,v 1.76 2001/03/01 00:37:18 bkoz Exp $
AUTOMAKE_OPTIONS = 1.3 gnits
MAINT_CHARSET = latin1
@ -32,7 +32,6 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
toolexecdir = @glibcpp_toolexecdir@
toolexeclibdir = @glibcpp_toolexeclibdir@
toolexeclib_LTLIBRARIES = libstdc++.la
EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
# Compile flags that should be constant throughout the build, both for
# SUBDIRS and for libstdc++-v3 in general.
@ -169,10 +168,9 @@ sources = \
globals.cc \
basic_file.cc ios.cc complex_io.cc strstream.cc \
c++locale.cc locale.cc localename.cc codecvt.cc \
locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc
locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc \
string-inst.cc wstring-inst.cc
wstring_sources = \
wstring-inst.cc
VPATH += $(top_srcdir) $(top_srcdir)/src
VPATH += $(GLIBCPP_INCLUDE_DIR)
@ -180,12 +178,9 @@ VPATH += $(GLIBCPP_INCLUDE_DIR)/std $(C_INCLUDE_DIR)
libstdc___la_SOURCES = $(sources)
libinst_wstring_la_SOURCES = $(wstring_sources)
libstdc___la_LIBADD = \
../libmath/libmath.la @libio_la@ \
../libsupc++/libsupc++convenience.la \
@libinst_wstring_la@
../libsupc++/libsupc++convenience.la
libstdc___la_LDFLAGS = -version-info 3:0:0 -lm
@ -199,13 +194,6 @@ strstream.lo: strstream.cc
strstream.o: strstream.cc
$(CXXCOMPILE) -I$(GLIBCPP_INCLUDE_DIR)/backward -c $<
# Make wstring-inst.cc from string-inst.cc
wstring-inst.o: string-inst.cc
$(CXXCOMPILE) -c -DC=wchar_t $< -o $@
wstring-inst.lo: string-inst.cc
$(LTCXXCOMPILE) -c -DC=wchar_t $< -o $@
# Make sure cshadow headers are built first.
if GLIBCPP_USE_CSHADOW
CSHADOW_H = $(top_builddir)/stamp-cshadow

42
libstdc++-v3/src/Makefile.in
View File

@ -100,7 +100,6 @@ glibcpp_basedir = @glibcpp_basedir@
glibcpp_toolexecdir = @glibcpp_toolexecdir@
glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
ifGNUmake = @ifGNUmake@
libinst_wstring_la = @libinst_wstring_la@
libio_la = @libio_la@
toplevel_srcdir = @toplevel_srcdir@
@ -113,7 +112,6 @@ mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
toolexecdir = @glibcpp_toolexecdir@
toolexeclibdir = @glibcpp_toolexeclibdir@
toolexeclib_LTLIBRARIES = libstdc++.la
EXTRA_LTLIBRARIES = libinst-string.la libinst-wstring.la
# Compile flags that should be constant throughout the build, both for
# SUBDIRS and for libstdc++-v3 in general.
@ -163,18 +161,13 @@ std_headers = algorithm bitset complex deque fstream functional iomanip ios i
build_headers = bits/std_limits.h bits/c++config.h bits/c++io.h bits/c++locale.h bits/c++threads.h bits/basic_file_model.h bits/atomicity.h bits/os_defines.h bits/ctype_base.h bits/ctype_noninline.h bits/ctype_inline.h
sources = limitsMEMBERS.cc stdexcept.cc functexcept.cc bitset.cc globals.cc basic_file.cc ios.cc complex_io.cc strstream.cc c++locale.cc locale.cc localename.cc codecvt.cc locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc
wstring_sources = wstring-inst.cc
sources = limitsMEMBERS.cc stdexcept.cc functexcept.cc bitset.cc globals.cc basic_file.cc ios.cc complex_io.cc strstream.cc c++locale.cc locale.cc localename.cc codecvt.cc locale-inst.cc stl-inst.cc misc-inst.cc valarray-inst.cc string-inst.cc wstring-inst.cc
VPATH = $(top_srcdir) $(top_srcdir)/src $(GLIBCPP_INCLUDE_DIR) $(GLIBCPP_INCLUDE_DIR)/std $(C_INCLUDE_DIR)
libstdc___la_SOURCES = $(sources)
libinst_wstring_la_SOURCES = $(wstring_sources)
libstdc___la_LIBADD = ../libmath/libmath.la @libio_la@ ../libsupc++/libsupc++convenience.la @libinst_wstring_la@
libstdc___la_LIBADD = ../libmath/libmath.la @libio_la@ ../libsupc++/libsupc++convenience.la
libstdc___la_LDFLAGS = -version-info 3:0:0 -lm
@ -238,25 +231,14 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
libinst_string_la_LDFLAGS =
libinst_string_la_LIBADD =
libinst_string_la_SOURCES = libinst-string.la.c
libinst_string_la_OBJECTS = libinst-string.la.lo
libinst_wstring_la_LDFLAGS =
libinst_wstring_la_LIBADD =
libinst_wstring_la_OBJECTS = wstring-inst.lo
libstdc___la_OBJECTS = limitsMEMBERS.lo stdexcept.lo functexcept.lo \
bitset.lo globals.lo basic_file.lo ios.lo complex_io.lo strstream.lo \
c++locale.lo locale.lo localename.lo codecvt.lo locale-inst.lo \
stl-inst.lo misc-inst.lo valarray-inst.lo string-inst.lo
stl-inst.lo misc-inst.lo valarray-inst.lo string-inst.lo \
wstring-inst.lo
CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
CXXLD = $(CXX)
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
DIST_COMMON = Makefile.am Makefile.in
@ -264,8 +246,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar
GZIP_ENV = --best
SOURCES = libinst-string.la.c $(libinst_wstring_la_SOURCES) $(libstdc___la_SOURCES)
OBJECTS = libinst-string.la.lo $(libinst_wstring_la_OBJECTS) $(libstdc___la_OBJECTS)
SOURCES = $(libstdc___la_SOURCES)
OBJECTS = $(libstdc___la_OBJECTS)
all: all-redirect
.SUFFIXES:
@ -347,12 +329,6 @@ distclean-libtool:
maintainer-clean-libtool:
libinst-string.la: $(libinst_string_la_OBJECTS) $(libinst_string_la_DEPENDENCIES)
$(LINK) $(libinst_string_la_LDFLAGS) $(libinst_string_la_OBJECTS) $(libinst_string_la_LIBADD) $(LIBS)
libinst-wstring.la: $(libinst_wstring_la_OBJECTS) $(libinst_wstring_la_DEPENDENCIES)
$(CXXLINK) $(libinst_wstring_la_LDFLAGS) $(libinst_wstring_la_OBJECTS) $(libinst_wstring_la_LIBADD) $(LIBS)
libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
$(CXXLINK) -rpath $(toolexeclibdir) $(libstdc___la_LDFLAGS) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
.cc.o:
@ -494,12 +470,6 @@ strstream.lo: strstream.cc
strstream.o: strstream.cc
$(CXXCOMPILE) -I$(GLIBCPP_INCLUDE_DIR)/backward -c $<
# Make wstring-inst.cc from string-inst.cc
wstring-inst.o: string-inst.cc
$(CXXCOMPILE) -c -DC=wchar_t $< -o $@
wstring-inst.lo: string-inst.cc
$(LTCXXCOMPILE) -c -DC=wchar_t $< -o $@
# Specify that all *.o's depend on this.
$(libstdc___la_OBJECTS): $(CSHADOW_H)

6
libstdc++-v3/src/wstring-inst.cc Normal file
View File

@ -0,0 +1,6 @@
#include <bits/c++config.h>
#ifdef _GLIBCPP_USE_WCHAR_T
#define C wchar_t
#include "string-inst.cc"
#endif