Skip to content

R
riscv-gcc-1
Commit 697649ea by Benjamin Kosnik
Options

Makefile.am (exception): Change exception.cc to exception_support.cc. 


2000-10-18   Benjamin Kosnik  <bkoz@purist.soma.redhat.com>

	* libsupc++/Makefile.am (exception): Change exception.cc to
	exception_support.cc.
	(CXXLINK): Remove bogus --tag CC.
	* libsupc++/Makefile.in: Regenerate.
	* libsupc++/exception.cc: Move to...
	* libsupc++/exception_support.cc: ...here.

	* src/Makefile.am: Remove bogus --tag CC.
	* src/Makefile.in: Regenerate.

	* include/bits/locale_facets.tcc (use_facet): Simplify.
	* include/bits/locale_facets.h (use_facet<ctype<char> >): Correct
	use_facet declaration. Replace 'const ctype<T>' with ctype<T>.
	(use_facet<ctype<wchar_t> >): Same.
	* src/locale-inst.cc: Remove explicit instantiation.
	* src/locale.cc: Correct signature here too.
	(_Bad_use_facet::what()): Correct error string.
	* include/bits/localefwd.h: Correct comment.

	* mkcheck.in (C_DIR): Change libsupc++/include to libsupc++.

From-SVN: r36943
parent 91ce572a
Showing with 49 additions and 429 deletions
libstdc++-v3/ChangeLog
Tue Oct 17 20:06:59 2000 Martin Buchholz <martin@xemacs.org>
2000-10-18 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
* libsupc++/Makefile.am (exception): Change exception.cc to
exception_support.cc.
(CXXLINK): Remove bogus --tag CC.
* libsupc++/Makefile.in: Regenerate.
* libsupc++/exception.cc: Move to...
* libsupc++/exception_support.cc: ...here.
* src/Makefile.am: Remove bogus --tag CC.
* src/Makefile.in: Regenerate.
* include/bits/locale_facets.tcc (use_facet): Simplify.
* include/bits/locale_facets.h (use_facet<ctype<char> >): Correct
use_facet declaration. Replace 'const ctype<T>' with ctype<T>.
(use_facet<ctype<wchar_t> >): Same.
* src/locale-inst.cc: Remove explicit instantiation.
* src/locale.cc: Correct signature here too.
(_Bad_use_facet::what()): Correct error string.
* include/bits/localefwd.h: Correct comment.
* mkcheck.in (C_DIR): Change libsupc++/include to libsupc++.
2000-10-17 Martin Buchholz <martin@xemacs.org>
* testsuite/27_io/istream_seeks.cc: Fix spelling typo.
* testsuite/27_io/ostream_seeks.cc: Similarly.
......
libstdc++-v3/include/bits/locale_facets.h
......@@ -390,7 +390,7 @@ namespace std
template<>
const ctype<char>&
use_facet<const ctype<char> >(const locale& __loc);
use_facet<ctype<char> >(const locale& __loc);
#ifdef _GLIBCPP_USE_WCHAR_T
// ctype<wchar_t> specialization
......@@ -503,7 +503,7 @@ namespace std
template<>
const ctype<wchar_t>&
use_facet< const ctype<wchar_t> >(const locale& __loc);
use_facet<ctype<wchar_t> >(const locale& __loc);
#endif //_GLIBCPP_USE_WCHAR_T
// Include host-specific ctype inlines.
......
libstdc++-v3/include/bits/locale_facets.tcc
......@@ -70,11 +70,11 @@ namespace std
use_facet(const locale& __loc)
{
typedef locale::_Impl::__vec_facet __vec_facet;
const locale::facet* __fp = (const _Facet*)0; // check derivation
locale::id& __id = _Facet::id; // check member id
size_t __i = __id._M_index;
__vec_facet* __facet = __loc._M_impl->_M_facets;
if (__i >= __facet->size() || (__fp = (*(__facet))[__i]) == 0)
const locale::facet* __fp = (*__facet)[__i]; // check derivation
if (__i >= __facet->size() || __fp == 0)
return _Use_facet_failure_handler<_Facet>(__loc);
return static_cast<const _Facet&>(*__fp);
}
......
libstdc++-v3/include/bits/localefwd.h
......@@ -141,7 +141,7 @@ namespace std
template<typename _CharT>
class ctype_byname;
// NB: Specialized for char and wchar_t in locfacets.h.
// NB: Specialized for char and wchar_t in locale_facets.h.
class codecvt_base;
template<typename _InternT, typename _ExternT, typename _StateT>
......
libstdc++-v3/libsupc++/Makefile.am
......@@ -84,7 +84,7 @@ sources = \
del_opnt.cc \
del_opv.cc \
del_opvnt.cc \
exception.cc \
exception_support.cc \
new_handler.cc \
new_op.cc \
new_opnt.cc \
......@@ -127,7 +127,6 @@ AM_CXXFLAGS = \
$(OPTIMIZE_CXXFLAGS) \
$(CONFIG_CXXFLAGS)
# libstdc++ libtool notes
# 1) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is
......@@ -153,5 +152,11 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
# the rules automake generates would be used. We cannot allow CXX to
# be used in libtool since this would add -lstdc++ to the link line
# which of course is problematic at this point.
CXXLINK = $(LIBTOOL) --tag CC --mode=link "$(CC)" \
CXXLINK = $(LIBTOOL) --mode=link "$(CC)" \
@OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
libstdc++-v3/libsupc++/Makefile.in
......@@ -147,7 +147,7 @@ INCLUDES = -I$(top_srcdir)/../gcc -I$(top_srcdir)/../include $(CSHADOW_INCLUD
headers = cxxabi.h exception new new.h typeinfo
sources = del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc exception.cc new_handler.cc new_op.cc new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc vec.cc
sources = del_op.cc del_opnt.cc del_opv.cc del_opvnt.cc exception_support.cc new_handler.cc new_op.cc new_opnt.cc new_opv.cc new_opvnt.cc pure.cc tinfo.cc tinfo2.cc vec.cc
libsupc___la_SOURCES = $(sources)
......@@ -195,7 +195,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) $(
# the rules automake generates would be used. We cannot allow CXX to
# be used in libtool since this would add -lstdc++ to the link line
# which of course is problematic at this point.
CXXLINK = $(LIBTOOL) --tag CC --mode=link "$(CC)" @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = ../config.h
......@@ -210,12 +210,12 @@ LIBS = @LIBS@
libsupc__convenience_la_LDFLAGS =
libsupc__convenience_la_LIBADD =
libsupc__convenience_la_OBJECTS = del_op.lo del_opnt.lo del_opv.lo \
del_opvnt.lo exception.lo new_handler.lo new_op.lo new_opnt.lo \
del_opvnt.lo exception_support.lo new_handler.lo new_op.lo new_opnt.lo \
new_opv.lo new_opvnt.lo pure.lo tinfo.lo tinfo2.lo vec.lo
libsupc___la_LDFLAGS =
libsupc___la_LIBADD =
libsupc___la_OBJECTS = del_op.lo del_opnt.lo del_opv.lo del_opvnt.lo \
exception.lo new_handler.lo new_op.lo new_opnt.lo new_opv.lo \
exception_support.lo new_handler.lo new_op.lo new_opnt.lo new_opv.lo \
new_opvnt.lo pure.lo tinfo.lo tinfo2.lo vec.lo
CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
......
libstdc++-v3/mkcheck.in
......@@ -58,7 +58,7 @@ C_DIR="`basename @C_INCLUDE_DIR@`"
if [ $WHICH != "1" ]; then
INC_PATH="@CSHADOW_FLAGS@ -I$BUILD_DIR -I$BUILD_DIR/libio \
-I$SRC_DIR/include/std -I$SRC_DIR/include/$C_DIR \
-I$SRC_DIR/include -I$SRC_DIR/libsupc++/include -I$SRC_DIR/libio \
-I$SRC_DIR/include -I$SRC_DIR/libsupc++ -I$SRC_DIR/libio \
-I$SRC_DIR/testsuite"
elif [ $WHICH -eq 1 ]; then
INC_PATH="-I$SRC_DIR/testsuite"
......
libstdc++-v3/src/Makefile.am
......@@ -21,7 +21,7 @@
## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
## USA.
## $Id: Makefile.am,v 1.41 2000/10/15 08:45:33 bkoz Exp $
## $Id: Makefile.am,v 1.42 2000/10/17 10:12:23 bkoz Exp $
AUTOMAKE_OPTIONS = 1.3 gnits
MAINT_CHARSET = latin1
......@@ -337,5 +337,5 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
# the rules automake generates would be used. We cannot allow CXX to
# be used in libtool since this would add -lstdc++ to the link line
# which of course is problematic at this point.
CXXLINK = $(LIBTOOL) --tag CC --mode=link "$(CC)" \
CXXLINK = $(LIBTOOL) --mode=link "$(CC)" \
@OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
libstdc++-v3/src/Makefile.in
......@@ -220,7 +220,7 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) $(
# the rules automake generates would be used. We cannot allow CXX to
# be used in libtool since this would add -lstdc++ to the link line
# which of course is problematic at this point.
CXXLINK = $(LIBTOOL) --tag CC --mode=link "$(CC)" @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = ../config.h
......
libstdc++-v3/src/locale-inst.cc
......@@ -153,9 +153,6 @@ namespace std {
const num_get<char, ibuf_iterator >&
use_facet<num_get<char, ibuf_iterator> >(const locale &);
template
const ctype<char>&
use_facet<ctype<char> >(const locale& __loc);
template
const codecvt<char, char, mbstate_t>&
use_facet<codecvt<char, char, mbstate_t> >(const locale&);
template
......@@ -170,9 +167,6 @@ namespace std {
const num_get<wchar_t, wibuf_iterator>&
use_facet<num_get<wchar_t, wibuf_iterator> >(const locale &);
template
const ctype<wchar_t>&
use_facet<ctype<wchar_t> >(const locale& __loc);
template
const codecvt<wchar_t, char, mbstate_t>&
use_facet<codecvt<wchar_t, char, mbstate_t> >(locale const &);
template
......
libstdc++-v3/src/locale.cc
......@@ -189,7 +189,7 @@ namespace std {
template<>
const ctype<char>&
use_facet<const ctype<char> > (const locale& __loc)
use_facet<ctype<char> >(const locale& __loc)
{
size_t __i = ctype<char>::id._M_index;
const locale::_Impl* __tmp = __loc._M_impl;
......@@ -199,7 +199,7 @@ namespace std {
#ifdef _GLIBCPP_USE_WCHAR_T
template<>
const ctype<wchar_t>&
use_facet< const ctype<wchar_t> > (const locale& __loc)
use_facet<ctype<wchar_t> >(const locale& __loc)
{
size_t __i = ctype<wchar_t>::id._M_index;
const locale::_Impl* __tmp = __loc._M_impl;
......@@ -649,6 +649,7 @@ namespace std {
try {
// 26 Standard facets, 2 references.
// One reference for _M_classic, one for _M_global
// XXX _S_classic = _S_global = new _Impl(26, 2);
_S_classic = new _Impl(_S_facets_num, 2, true, "C");
_S_global = _S_classic;
......@@ -771,7 +772,7 @@ namespace std {
char const*
_Bad_use_facet::
what() const throw()
{ return "bad_cast thrown from use_facet"; }
{ return "_Bad_use_facet thrown from use_facet"; }
_Bad_use_facet::
~_Bad_use_facet() throw() { }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment