mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-04-04 23:01:19 +08:00
Makefile.am (sources): Edit.
2002-09-10 Benjamin Kosnik <bkoz@redhat.com> * src/Makefile.am (sources): Edit. (target_sources): New. (target_sources_extra): New. * src/Makefile.in: Regenerate. * acinclude.m4: Set CCODECVT_CC. * aclocal.m4: Regenerate. * configure: Regenerate. * src/locale.cc: Move ctype definitions... * src/ctype.cc: ...here. New file. * src/locale.cc: Move codecvt definitions... * src/codecvt.cc: ...here. * config/generic/codecvt_members.cc: ...and here. * config/gnu/codecvt_members.cc: ...and here. * include/bits/codecvt.h: Tweak. * include/bits/locale_facets: Tweak. * src/bitset.cc: Correct license text. * src/concept-inst.cc: Same. * src/strstream.cc: Same. * src/vterminate.cc: Same. From-SVN: r57020
This commit is contained in:
Benjamin Kosnik
Benjamin Kosnik
parent
77de9af251
commit
38cca75024
@ -1,3 +1,26 @@
|
||||
2002-09-10 Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
* src/Makefile.am (sources): Edit.
|
||||
(target_sources): New.
|
||||
(target_sources_extra): New.
|
||||
* src/Makefile.in: Regenerate.
|
||||
* acinclude.m4: Set CCODECVT_CC.
|
||||
* aclocal.m4: Regenerate.
|
||||
* configure: Regenerate.
|
||||
* src/locale.cc: Move ctype definitions...
|
||||
* src/ctype.cc: ...here. New file.
|
||||
* src/locale.cc: Move codecvt definitions...
|
||||
* src/codecvt.cc: ...here.
|
||||
* config/generic/codecvt_members.cc: ...and here.
|
||||
* config/gnu/codecvt_members.cc: ...and here.
|
||||
* include/bits/codecvt.h: Tweak.
|
||||
* include/bits/locale_facets: Tweak.
|
||||
|
||||
* src/bitset.cc: Correct license text.
|
||||
* src/concept-inst.cc: Same.
|
||||
* src/strstream.cc: Same.
|
||||
* src/vterminate.cc: Same.
|
||||
|
||||
2002-09-10 Gabriel Dos Reis <gdr@soliton.integrable-solutions.net>
|
||||
|
||||
* include/bits/stl_vector.h (vector<>): Don't use a name with
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
@ -157,7 +157,44 @@ MULTICLEAN = true
|
||||
# Work around what appears to be a GNU make bug handling MAKEFLAGS
|
||||
# values defined in terms of make variables, as is the case for CC and
|
||||
# friends when we are called from the top level Makefile.
|
||||
AM_MAKEFLAGS = "AR_FLAGS=$(AR_FLAGS)" "CC_FOR_BUILD=$(CC_FOR_BUILD)" "CC_FOR_TARGET=$(CC_FOR_TARGET)" "CFLAGS=$(CFLAGS)" "CXXFLAGS=$(CXXFLAGS)" "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" "INSTALL=$(INSTALL)" "INSTALL_DATA=$(INSTALL_DATA)" "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" "LDFLAGS=$(LDFLAGS)" "LIBCFLAGS=$(LIBCFLAGS)" "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" "MAKE=$(MAKE)" "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" "PICFLAG=$(PICFLAG)" "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" "SHELL=$(SHELL)" "RUNTESTFLAGS=$(RUNTESTFLAGS)" "exec_prefix=$(exec_prefix)" "infodir=$(infodir)" "libdir=$(libdir)" "includedir=$(includedir)" "prefix=$(prefix)" "tooldir=$(tooldir)" "AR=$(AR)" "AS=$(AS)" "LD=$(LD)" "LIBCFLAGS=$(LIBCFLAGS)" "PICFLAG=$(PICFLAG)" "RANLIB=$(RANLIB)" "NM=$(NM)" "NM_FOR_BUILD=$(NM_FOR_BUILD)" "NM_FOR_TARGET=$(NM_FOR_TARGET)" "DESTDIR=$(DESTDIR)" "WERROR=$(WERROR)"
|
||||
AM_MAKEFLAGS = \
|
||||
"AR_FLAGS=$(AR_FLAGS)" \
|
||||
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
|
||||
"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
|
||||
"CFLAGS=$(CFLAGS)" \
|
||||
"CXXFLAGS=$(CXXFLAGS)" \
|
||||
"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
|
||||
"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
|
||||
"INSTALL=$(INSTALL)" \
|
||||
"INSTALL_DATA=$(INSTALL_DATA)" \
|
||||
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
|
||||
"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
|
||||
"LDFLAGS=$(LDFLAGS)" \
|
||||
"LIBCFLAGS=$(LIBCFLAGS)" \
|
||||
"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
|
||||
"MAKE=$(MAKE)" \
|
||||
"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
|
||||
"PICFLAG=$(PICFLAG)" \
|
||||
"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
|
||||
"SHELL=$(SHELL)" \
|
||||
"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
|
||||
"exec_prefix=$(exec_prefix)" \
|
||||
"infodir=$(infodir)" \
|
||||
"libdir=$(libdir)" \
|
||||
"includedir=$(includedir)" \
|
||||
"prefix=$(prefix)" \
|
||||
"tooldir=$(tooldir)" \
|
||||
"AR=$(AR)" \
|
||||
"AS=$(AS)" \
|
||||
"LD=$(LD)" \
|
||||
"LIBCFLAGS=$(LIBCFLAGS)" \
|
||||
"PICFLAG=$(PICFLAG)" \
|
||||
"RANLIB=$(RANLIB)" \
|
||||
"NM=$(NM)" \
|
||||
"NM_FOR_BUILD=$(NM_FOR_BUILD)" \
|
||||
"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
|
||||
"DESTDIR=$(DESTDIR)" \
|
||||
"WERROR=$(WERROR)"
|
||||
|
||||
|
||||
# Subdir rules rely on $(FLAGS_TO_PASS)
|
||||
@ -172,7 +209,7 @@ mkcheck.in testsuite_flags.in
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = tar
|
||||
TAR = gtar
|
||||
GZIP_ENV = --best
|
||||
all: all-redirect
|
||||
.SUFFIXES:
|
||||
|
||||
@ -1175,6 +1175,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
||||
CLOCALE_H=config/locale/generic/c_locale.h
|
||||
CLOCALE_CC=config/locale/generic/c_locale.cc
|
||||
CCODECVT_H=config/locale/generic/codecvt_specializations.h
|
||||
CCODECVT_CC=config/locale/generic/codecvt_members.cc
|
||||
CCOLLATE_CC=config/locale/generic/collate_members.cc
|
||||
CCTYPE_CC=config/locale/generic/ctype_members.cc
|
||||
CMESSAGES_H=config/locale/generic/messages_members.h
|
||||
@ -1208,6 +1209,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
||||
CLOCALE_H=config/locale/gnu/c_locale.h
|
||||
CLOCALE_CC=config/locale/gnu/c_locale.cc
|
||||
CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
|
||||
CCODECVT_CC=config/locale/gnu/codecvt_members.cc
|
||||
CCOLLATE_CC=config/locale/gnu/collate_members.cc
|
||||
CCTYPE_CC=config/locale/gnu/ctype_members.cc
|
||||
CMESSAGES_H=config/locale/gnu/messages_members.h
|
||||
@ -1223,6 +1225,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
||||
CLOCALE_H=config/locale/ieee_1003.1-2001/c_locale.h
|
||||
CLOCALE_CC=config/locale/ieee_1003.1-2001/c_locale.cc
|
||||
CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
|
||||
CCODECVT_CC=config/locale/generic/codecvt_members.cc
|
||||
CCOLLATE_CC=config/locale/generic/collate_members.cc
|
||||
CCTYPE_CC=config/locale/generic/ctype_members.cc
|
||||
CMESSAGES_H=config/locale/ieee_1003.1-2001/messages_members.h
|
||||
@ -1243,17 +1246,22 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
||||
glibcpp_localedir=${glibcpp_builddir}/po/share/locale
|
||||
AC_SUBST(glibcpp_localedir)
|
||||
|
||||
# For the time being, transform ctype_noninline.h to ctype_members_char.cc
|
||||
# CCTYPE_CHAR_CC=config/${os_include_dir}/ctype_noninline.h
|
||||
|
||||
AC_SUBST(USE_NLS)
|
||||
AC_SUBST(CLOCALE_H)
|
||||
AC_SUBST(CCODECVT_H)
|
||||
AC_SUBST(CMESSAGES_H)
|
||||
AC_LINK_FILES($CLOCALE_CC, src/c++locale.cc)
|
||||
AC_LINK_FILES($CCOLLATE_CC, src/collate.cc)
|
||||
AC_LINK_FILES($CCTYPE_CC, src/ctype.cc)
|
||||
AC_LINK_FILES($CMESSAGES_CC, src/messages.cc)
|
||||
AC_LINK_FILES($CMONEY_CC, src/monetary.cc)
|
||||
AC_LINK_FILES($CNUMERIC_CC, src/numeric.cc)
|
||||
AC_LINK_FILES($CTIME_CC, src/time.cc)
|
||||
AC_LINK_FILES($CCODECVT_CC, src/codecvt_members.cc)
|
||||
AC_LINK_FILES($CCOLLATE_CC, src/collate_members.cc)
|
||||
# AC_LINK_FILES($CCTYPE_CHAR_CC, src/ctype_members_char.cc)
|
||||
AC_LINK_FILES($CCTYPE_CC, src/ctype_members.cc)
|
||||
AC_LINK_FILES($CMESSAGES_CC, src/messages_members.cc)
|
||||
AC_LINK_FILES($CMONEY_CC, src/monetary_members.cc)
|
||||
AC_LINK_FILES($CNUMERIC_CC, src/numeric_members.cc)
|
||||
AC_LINK_FILES($CTIME_CC, src/time_members.cc)
|
||||
AC_LINK_FILES($CLOCALE_INTERNAL_H, src/c++locale_internal.h)
|
||||
])
|
||||
|
||||
|
||||
69
libstdc++-v3/aclocal.m4
vendored
69
libstdc++-v3/aclocal.m4
vendored
@ -1,4 +1,4 @@
|
||||
dnl aclocal.m4 generated automatically by aclocal 1.4-p6
|
||||
dnl aclocal.m4 generated automatically by aclocal 1.4-p5
|
||||
|
||||
dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
@ -11,7 +11,7 @@ dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||
dnl PARTICULAR PURPOSE.
|
||||
|
||||
dnl
|
||||
dnl Initialize configure bits.
|
||||
dnl Initialize basic configure bits, set toplevel_srcdir for Makefiles.
|
||||
dnl
|
||||
dnl GLIBCPP_TOPREL_CONFIGURE
|
||||
AC_DEFUN(GLIBCPP_TOPREL_CONFIGURE, [
|
||||
@ -49,13 +49,10 @@ AC_DEFUN(GLIBCPP_TOPREL_CONFIGURE, [
|
||||
])
|
||||
|
||||
dnl
|
||||
dnl Initialize configure bits.
|
||||
dnl Initialize the rest of the library configury.
|
||||
dnl
|
||||
dnl GLIBCPP_CONFIGURE
|
||||
AC_DEFUN(GLIBCPP_CONFIGURE, [
|
||||
|
||||
#possibly test for the presence of the compiler sources here?
|
||||
|
||||
# Export build and source directories.
|
||||
# These need to be absolute paths, yet at the same time need to
|
||||
# canonicalize only relative paths, because then amd will not unmount
|
||||
@ -1190,6 +1187,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
||||
CLOCALE_H=config/locale/generic/c_locale.h
|
||||
CLOCALE_CC=config/locale/generic/c_locale.cc
|
||||
CCODECVT_H=config/locale/generic/codecvt_specializations.h
|
||||
CCODECVT_CC=config/locale/generic/codecvt_members.cc
|
||||
CCOLLATE_CC=config/locale/generic/collate_members.cc
|
||||
CCTYPE_CC=config/locale/generic/ctype_members.cc
|
||||
CMESSAGES_H=config/locale/generic/messages_members.h
|
||||
@ -1223,6 +1221,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
||||
CLOCALE_H=config/locale/gnu/c_locale.h
|
||||
CLOCALE_CC=config/locale/gnu/c_locale.cc
|
||||
CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
|
||||
CCODECVT_CC=config/locale/gnu/codecvt_members.cc
|
||||
CCOLLATE_CC=config/locale/gnu/collate_members.cc
|
||||
CCTYPE_CC=config/locale/gnu/ctype_members.cc
|
||||
CMESSAGES_H=config/locale/gnu/messages_members.h
|
||||
@ -1238,6 +1237,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
||||
CLOCALE_H=config/locale/ieee_1003.1-2001/c_locale.h
|
||||
CLOCALE_CC=config/locale/ieee_1003.1-2001/c_locale.cc
|
||||
CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
|
||||
CCODECVT_CC=config/locale/generic/codecvt_members.cc
|
||||
CCOLLATE_CC=config/locale/generic/collate_members.cc
|
||||
CCTYPE_CC=config/locale/generic/ctype_members.cc
|
||||
CMESSAGES_H=config/locale/ieee_1003.1-2001/messages_members.h
|
||||
@ -1258,17 +1258,22 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
||||
glibcpp_localedir=${glibcpp_builddir}/po/share/locale
|
||||
AC_SUBST(glibcpp_localedir)
|
||||
|
||||
# For the time being, transform ctype_noninline.h to ctype_members_char.cc
|
||||
# CCTYPE_CHAR_CC=config/${os_include_dir}/ctype_noninline.h
|
||||
|
||||
AC_SUBST(USE_NLS)
|
||||
AC_SUBST(CLOCALE_H)
|
||||
AC_SUBST(CCODECVT_H)
|
||||
AC_SUBST(CMESSAGES_H)
|
||||
AC_LINK_FILES($CLOCALE_CC, src/c++locale.cc)
|
||||
AC_LINK_FILES($CCOLLATE_CC, src/collate.cc)
|
||||
AC_LINK_FILES($CCTYPE_CC, src/ctype.cc)
|
||||
AC_LINK_FILES($CMESSAGES_CC, src/messages.cc)
|
||||
AC_LINK_FILES($CMONEY_CC, src/monetary.cc)
|
||||
AC_LINK_FILES($CNUMERIC_CC, src/numeric.cc)
|
||||
AC_LINK_FILES($CTIME_CC, src/time.cc)
|
||||
AC_LINK_FILES($CCODECVT_CC, src/codecvt_members.cc)
|
||||
AC_LINK_FILES($CCOLLATE_CC, src/collate_members.cc)
|
||||
# AC_LINK_FILES($CCTYPE_CHAR_CC, src/ctype_members_char.cc)
|
||||
AC_LINK_FILES($CCTYPE_CC, src/ctype_members.cc)
|
||||
AC_LINK_FILES($CMESSAGES_CC, src/messages_members.cc)
|
||||
AC_LINK_FILES($CMONEY_CC, src/monetary_members.cc)
|
||||
AC_LINK_FILES($CNUMERIC_CC, src/numeric_members.cc)
|
||||
AC_LINK_FILES($CTIME_CC, src/time_members.cc)
|
||||
AC_LINK_FILES($CLOCALE_INTERNAL_H, src/c++locale_internal.h)
|
||||
])
|
||||
|
||||
@ -2219,7 +2224,7 @@ AC_MSG_RESULT($enable_symvers)
|
||||
])
|
||||
|
||||
|
||||
# isc-posix.m4 serial 2 (gettext-0.11.2)
|
||||
# isc-posix.m4 serial 1 (gettext-0.10.40)
|
||||
dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
|
||||
dnl This file is free software, distributed under the terms of the GNU
|
||||
dnl General Public License. As a special exception to the GNU General
|
||||
@ -2227,8 +2232,6 @@ dnl Public License, this file may be distributed as part of a program
|
||||
dnl that contains a configuration script generated by Autoconf, under
|
||||
dnl the same distribution terms as the rest of that program.
|
||||
|
||||
# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
|
||||
|
||||
# This test replaces the one in autoconf.
|
||||
# Currently this macro should have the same name as the autoconf macro
|
||||
# because gettext's gettext.m4 (distributed in the automake package)
|
||||
@ -2289,8 +2292,7 @@ dnl Usage:
|
||||
dnl AM_INIT_AUTOMAKE(package,version, [no-define])
|
||||
|
||||
AC_DEFUN([AM_INIT_AUTOMAKE],
|
||||
[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
|
||||
AC_REQUIRE([AC_PROG_INSTALL])
|
||||
[AC_REQUIRE([AC_PROG_INSTALL])
|
||||
PACKAGE=[$1]
|
||||
AC_SUBST(PACKAGE)
|
||||
VERSION=[$2]
|
||||
@ -2306,42 +2308,13 @@ AC_REQUIRE([AM_SANITY_CHECK])
|
||||
AC_REQUIRE([AC_ARG_PROGRAM])
|
||||
dnl FIXME This is truly gross.
|
||||
missing_dir=`cd $ac_aux_dir && pwd`
|
||||
AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
|
||||
AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
|
||||
AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
|
||||
AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
|
||||
AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
|
||||
AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
|
||||
AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
|
||||
AC_REQUIRE([AC_PROG_MAKE_SET])])
|
||||
|
||||
# Copyright 2002 Free Software Foundation, Inc.
|
||||
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
|
||||
# AM_AUTOMAKE_VERSION(VERSION)
|
||||
# ----------------------------
|
||||
# Automake X.Y traces this macro to ensure aclocal.m4 has been
|
||||
# generated from the m4 files accompanying Automake X.Y.
|
||||
AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
|
||||
|
||||
# AM_SET_CURRENT_AUTOMAKE_VERSION
|
||||
# -------------------------------
|
||||
# Call AM_AUTOMAKE_VERSION so it can be traced.
|
||||
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
|
||||
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
|
||||
[AM_AUTOMAKE_VERSION([1.4-p6])])
|
||||
|
||||
#
|
||||
# Check to make sure that the build environment is sane.
|
||||
#
|
||||
|
||||
101
libstdc++-v3/config/locale/generic/codecvt_members.cc
Normal file
101
libstdc++-v3/config/locale/generic/codecvt_members.cc
Normal file
@ -0,0 +1,101 @@
|
||||
// std::codecvt implementation details, generic version -*- C++ -*-
|
||||
|
||||
// Copyright (C) 2002 Free Software Foundation, Inc.
|
||||
//
|
||||
// This file is part of the GNU ISO C++ Library. This library is free
|
||||
// software; you can redistribute it and/or modify it under the
|
||||
// terms of the GNU General Public License as published by the
|
||||
// Free Software Foundation; either version 2, or (at your option)
|
||||
// any later version.
|
||||
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License along
|
||||
// with this library; see the file COPYING. If not, write to the Free
|
||||
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
||||
// USA.
|
||||
|
||||
// As a special exception, you may use this file as part of a free software
|
||||
// library without restriction. Specifically, if other files instantiate
|
||||
// templates or use macros or inline functions from this file, or you compile
|
||||
// this file and link it with other files to produce an executable, this
|
||||
// file does not by itself cause the resulting executable to be covered by
|
||||
// the GNU General Public License. This exception does not however
|
||||
// invalidate any other reasons why the executable file might be covered by
|
||||
// the GNU General Public License.
|
||||
|
||||
//
|
||||
// ISO C++ 14882: 22.2.1.5 - Template class codecvt
|
||||
//
|
||||
|
||||
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
#include <locale>
|
||||
#include "c++locale_internal.h"
|
||||
|
||||
namespace std
|
||||
{
|
||||
// Specializations.
|
||||
#ifdef _GLIBCPP_USE_WCHAR_T
|
||||
codecvt_base::result
|
||||
codecvt<wchar_t, char, mbstate_t>::
|
||||
do_out(state_type& __state, const intern_type* __from,
|
||||
const intern_type* __from_end, const intern_type*& __from_next,
|
||||
extern_type* __to, extern_type* __to_end,
|
||||
extern_type*& __to_next) const
|
||||
{
|
||||
result __ret = error;
|
||||
size_t __len = min(__from_end - __from, __to_end - __to);
|
||||
size_t __conv = wcsrtombs(__to, &__from, __len, &__state);
|
||||
|
||||
if (__conv == __len)
|
||||
{
|
||||
__from_next = __from;
|
||||
__to_next = __to + __conv;
|
||||
__ret = ok;
|
||||
}
|
||||
else if (__conv > 0 && __conv < __len)
|
||||
{
|
||||
__from_next = __from;
|
||||
__to_next = __to + __conv;
|
||||
__ret = partial;
|
||||
}
|
||||
else
|
||||
__ret = error;
|
||||
|
||||
return __ret;
|
||||
}
|
||||
|
||||
codecvt_base::result
|
||||
codecvt<wchar_t, char, mbstate_t>::
|
||||
do_in(state_type& __state, const extern_type* __from,
|
||||
const extern_type* __from_end, const extern_type*& __from_next,
|
||||
intern_type* __to, intern_type* __to_end,
|
||||
intern_type*& __to_next) const
|
||||
{
|
||||
result __ret = error;
|
||||
size_t __len = min(__from_end - __from, __to_end - __to);
|
||||
size_t __conv = mbsrtowcs(__to, &__from, __len, &__state);
|
||||
|
||||
if (__conv == __len)
|
||||
{
|
||||
__from_next = __from;
|
||||
__to_next = __to + __conv;
|
||||
__ret = ok;
|
||||
}
|
||||
else if (__conv > 0 && __conv < __len)
|
||||
{
|
||||
__from_next = __from;
|
||||
__to_next = __to + __conv;
|
||||
__ret = partial;
|
||||
}
|
||||
else
|
||||
__ret = error;
|
||||
|
||||
return __ret;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
113
libstdc++-v3/config/locale/gnu/codecvt_members.cc
Normal file
113
libstdc++-v3/config/locale/gnu/codecvt_members.cc
Normal file
@ -0,0 +1,113 @@
|
||||
// std::codecvt implementation details, GNU version -*- C++ -*-
|
||||
|
||||
// Copyright (C) 2002 Free Software Foundation, Inc.
|
||||
//
|
||||
// This file is part of the GNU ISO C++ Library. This library is free
|
||||
// software; you can redistribute it and/or modify it under the
|
||||
// terms of the GNU General Public License as published by the
|
||||
// Free Software Foundation; either version 2, or (at your option)
|
||||
// any later version.
|
||||
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License along
|
||||
// with this library; see the file COPYING. If not, write to the Free
|
||||
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
||||
// USA.
|
||||
|
||||
// As a special exception, you may use this file as part of a free software
|
||||
// library without restriction. Specifically, if other files instantiate
|
||||
// templates or use macros or inline functions from this file, or you compile
|
||||
// this file and link it with other files to produce an executable, this
|
||||
// file does not by itself cause the resulting executable to be covered by
|
||||
// the GNU General Public License. This exception does not however
|
||||
// invalidate any other reasons why the executable file might be covered by
|
||||
// the GNU General Public License.
|
||||
|
||||
//
|
||||
// ISO C++ 14882: 22.2.1.5 - Template class codecvt
|
||||
//
|
||||
|
||||
// Written by Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
#include <locale>
|
||||
#include "c++locale_internal.h"
|
||||
|
||||
namespace std
|
||||
{
|
||||
// Specializations.
|
||||
#ifdef _GLIBCPP_USE_WCHAR_T
|
||||
codecvt_base::result
|
||||
codecvt<wchar_t, char, mbstate_t>::
|
||||
do_out(state_type& __state, const intern_type* __from,
|
||||
const intern_type* __from_end, const intern_type*& __from_next,
|
||||
extern_type* __to, extern_type* __to_end,
|
||||
extern_type*& __to_next) const
|
||||
{
|
||||
result __ret = error;
|
||||
size_t __len = min(__from_end - __from, __to_end - __to);
|
||||
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
|
||||
__c_locale __old = __uselocale(_M_c_locale_codecvt);
|
||||
#endif
|
||||
size_t __conv = wcsrtombs(__to, &__from, __len, &__state);
|
||||
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
|
||||
__uselocale(__old);
|
||||
#endif
|
||||
|
||||
if (__conv == __len)
|
||||
{
|
||||
__from_next = __from;
|
||||
__to_next = __to + __conv;
|
||||
__ret = ok;
|
||||
}
|
||||
else if (__conv > 0 && __conv < __len)
|
||||
{
|
||||
__from_next = __from;
|
||||
__to_next = __to + __conv;
|
||||
__ret = partial;
|
||||
}
|
||||
else
|
||||
__ret = error;
|
||||
|
||||
return __ret;
|
||||
}
|
||||
|
||||
codecvt_base::result
|
||||
codecvt<wchar_t, char, mbstate_t>::
|
||||
do_in(state_type& __state, const extern_type* __from,
|
||||
const extern_type* __from_end, const extern_type*& __from_next,
|
||||
intern_type* __to, intern_type* __to_end,
|
||||
intern_type*& __to_next) const
|
||||
{
|
||||
result __ret = error;
|
||||
size_t __len = min(__from_end - __from, __to_end - __to);
|
||||
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
|
||||
__c_locale __old = __uselocale(_M_c_locale_codecvt);
|
||||
#endif
|
||||
size_t __conv = mbsrtowcs(__to, &__from, __len, &__state);
|
||||
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
|
||||
__uselocale(__old);
|
||||
#endif
|
||||
|
||||
if (__conv == __len)
|
||||
{
|
||||
__from_next = __from;
|
||||
__to_next = __to + __conv;
|
||||
__ret = ok;
|
||||
}
|
||||
else if (__conv > 0 && __conv < __len)
|
||||
{
|
||||
__from_next = __from;
|
||||
__to_next = __to + __conv;
|
||||
__ret = partial;
|
||||
}
|
||||
else
|
||||
__ret = error;
|
||||
|
||||
return __ret;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
2441
libstdc++-v3/configure
vendored
2441
libstdc++-v3/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
// Locale support (codecvt) -*- C++ -*-
|
||||
|
||||
// Copyright (C) 2000, 2001 Free Software Foundation, Inc.
|
||||
// Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
|
||||
//
|
||||
// This file is part of the GNU ISO C++ Library. This library is free
|
||||
// software; you can redistribute it and/or modify it under the
|
||||
@ -66,15 +66,11 @@
|
||||
{
|
||||
public:
|
||||
// Types:
|
||||
typedef codecvt_base::result result;
|
||||
typedef _InternT intern_type;
|
||||
typedef _ExternT extern_type;
|
||||
typedef _StateT state_type;
|
||||
|
||||
protected:
|
||||
__c_locale _M_c_locale_codecvt;
|
||||
|
||||
public:
|
||||
typedef codecvt_base::result result;
|
||||
typedef _InternT intern_type;
|
||||
typedef _ExternT extern_type;
|
||||
typedef _StateT state_type;
|
||||
|
||||
// 22.2.1.5.1 codecvt members
|
||||
result
|
||||
out(state_type& __state, const intern_type* __from,
|
||||
@ -163,17 +159,23 @@
|
||||
{
|
||||
public:
|
||||
// Types:
|
||||
typedef codecvt_base::result result;
|
||||
typedef _InternT intern_type;
|
||||
typedef _ExternT extern_type;
|
||||
typedef _StateT state_type;
|
||||
typedef codecvt_base::result result;
|
||||
typedef _InternT intern_type;
|
||||
typedef _ExternT extern_type;
|
||||
typedef _StateT state_type;
|
||||
|
||||
// Data Members:
|
||||
static locale::id id;
|
||||
protected:
|
||||
__c_locale _M_c_locale_codecvt;
|
||||
|
||||
public:
|
||||
static locale::id id;
|
||||
|
||||
explicit
|
||||
codecvt(size_t __refs = 0)
|
||||
: __codecvt_abstract_base<_InternT,_ExternT,_StateT> (__refs) { }
|
||||
: __codecvt_abstract_base<_InternT, _ExternT, _StateT> (__refs) { }
|
||||
|
||||
explicit
|
||||
codecvt(__c_locale __cloc, size_t __refs = 0);
|
||||
|
||||
protected:
|
||||
virtual
|
||||
@ -219,19 +221,21 @@
|
||||
{
|
||||
public:
|
||||
// Types:
|
||||
typedef char intern_type;
|
||||
typedef char extern_type;
|
||||
typedef mbstate_t state_type;
|
||||
typedef char intern_type;
|
||||
typedef char extern_type;
|
||||
typedef mbstate_t state_type;
|
||||
|
||||
// Data Members:
|
||||
protected:
|
||||
__c_locale _M_c_locale_codecvt;
|
||||
|
||||
public:
|
||||
static locale::id id;
|
||||
|
||||
explicit
|
||||
codecvt(size_t __refs = 0);
|
||||
|
||||
// Non-standard.
|
||||
explicit
|
||||
codecvt(__c_locale __cloc, size_t __refs = 0);
|
||||
codecvt(__c_locale __cloc, size_t __refs = 0);
|
||||
|
||||
protected:
|
||||
virtual
|
||||
@ -275,17 +279,19 @@
|
||||
{
|
||||
public:
|
||||
// Types:
|
||||
typedef wchar_t intern_type;
|
||||
typedef char extern_type;
|
||||
typedef mbstate_t state_type;
|
||||
typedef wchar_t intern_type;
|
||||
typedef char extern_type;
|
||||
typedef mbstate_t state_type;
|
||||
|
||||
// Data Members:
|
||||
static locale::id id;
|
||||
protected:
|
||||
__c_locale _M_c_locale_codecvt;
|
||||
|
||||
public:
|
||||
static locale::id id;
|
||||
|
||||
explicit
|
||||
codecvt(size_t __refs = 0);
|
||||
|
||||
// Non-standard.
|
||||
explicit
|
||||
codecvt(__c_locale __cloc, size_t __refs = 0);
|
||||
|
||||
|
||||
@ -847,7 +847,6 @@ namespace std
|
||||
: locale::facet(__refs)
|
||||
{ _M_c_locale_collate = _S_c_locale; }
|
||||
|
||||
// Non-standard.
|
||||
explicit
|
||||
collate(__c_locale __cloc, size_t __refs = 0)
|
||||
: locale::facet(__refs)
|
||||
|
||||
@ -60,12 +60,26 @@ INCLUDES = \
|
||||
$(LIBSUPCXX_INCLUDES) $(LIBIO_INCLUDES) $(LIBMATH_INCLUDES) \
|
||||
$(TOPLEVEL_INCLUDES)
|
||||
|
||||
sources = \
|
||||
# Source files linked in via configuration magic for a particular target.
|
||||
target_sources = \
|
||||
codecvt_members.cc \
|
||||
collate_members.cc \
|
||||
ctype_members.cc \
|
||||
messages_members.cc \
|
||||
monetary_members.cc \
|
||||
numeric_members.cc \
|
||||
time_members.cc
|
||||
|
||||
# Source files linked in via configuration magic for a particular
|
||||
# target, but with ad hoc naming rules.
|
||||
target_sources_extra = \
|
||||
basic_file.cc \
|
||||
c++locale.cc
|
||||
|
||||
# Sources present in the src directory.
|
||||
sources = \
|
||||
bitset.cc \
|
||||
c++locale.cc \
|
||||
codecvt.cc \
|
||||
collate.cc \
|
||||
complex_io.cc \
|
||||
concept-inst.cc \
|
||||
ctype.cc \
|
||||
@ -78,13 +92,10 @@ sources = \
|
||||
ios.cc \
|
||||
istream-inst.cc \
|
||||
limits.cc \
|
||||
locale-inst.cc \
|
||||
locale.cc \
|
||||
locale-inst.cc \
|
||||
localename.cc \
|
||||
messages.cc \
|
||||
misc-inst.cc \
|
||||
monetary.cc \
|
||||
numeric.cc \
|
||||
ostream-inst.cc \
|
||||
sstream-inst.cc \
|
||||
stdexcept.cc \
|
||||
@ -92,11 +103,11 @@ sources = \
|
||||
streambuf-inst.cc \
|
||||
string-inst.cc \
|
||||
strstream.cc \
|
||||
time.cc \
|
||||
valarray-inst.cc \
|
||||
vterminate.cc \
|
||||
wstring-inst.cc
|
||||
|
||||
wstring-inst.cc \
|
||||
${target_sources} \
|
||||
${target_sources_extra}
|
||||
|
||||
VPATH = $(top_srcdir)/src:$(top_srcdir)
|
||||
|
||||
|
||||
@ -166,12 +166,28 @@ INCLUDES = \
|
||||
$(TOPLEVEL_INCLUDES)
|
||||
|
||||
|
||||
sources = \
|
||||
# Source files linked in via configuration magic for a particular target.
|
||||
target_sources = \
|
||||
codecvt_members.cc \
|
||||
collate_members.cc \
|
||||
ctype_members.cc \
|
||||
messages_members.cc \
|
||||
monetary_members.cc \
|
||||
numeric_members.cc \
|
||||
time_members.cc
|
||||
|
||||
|
||||
# Source files linked in via configuration magic for a particular
|
||||
# target, but with ad hoc naming rules.
|
||||
target_sources_extra = \
|
||||
basic_file.cc \
|
||||
c++locale.cc
|
||||
|
||||
|
||||
# Sources present in the src directory.
|
||||
sources = \
|
||||
bitset.cc \
|
||||
c++locale.cc \
|
||||
codecvt.cc \
|
||||
collate.cc \
|
||||
complex_io.cc \
|
||||
concept-inst.cc \
|
||||
ctype.cc \
|
||||
@ -184,13 +200,10 @@ sources = \
|
||||
ios.cc \
|
||||
istream-inst.cc \
|
||||
limits.cc \
|
||||
locale-inst.cc \
|
||||
locale.cc \
|
||||
locale-inst.cc \
|
||||
localename.cc \
|
||||
messages.cc \
|
||||
misc-inst.cc \
|
||||
monetary.cc \
|
||||
numeric.cc \
|
||||
ostream-inst.cc \
|
||||
sstream-inst.cc \
|
||||
stdexcept.cc \
|
||||
@ -198,10 +211,11 @@ sources = \
|
||||
streambuf-inst.cc \
|
||||
string-inst.cc \
|
||||
strstream.cc \
|
||||
time.cc \
|
||||
valarray-inst.cc \
|
||||
vterminate.cc \
|
||||
wstring-inst.cc
|
||||
wstring-inst.cc \
|
||||
${target_sources} \
|
||||
${target_sources_extra}
|
||||
|
||||
|
||||
VPATH = $(top_srcdir)/src:$(top_srcdir)
|
||||
@ -279,14 +293,15 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LIBS = @LIBS@
|
||||
libstdc___la_OBJECTS = basic_file.lo bitset.lo c++locale.lo codecvt.lo \
|
||||
collate.lo complex_io.lo concept-inst.lo ctype.lo ext-inst.lo \
|
||||
fstream.lo fstream-inst.lo functexcept.lo globals.lo io-inst.lo ios.lo \
|
||||
istream-inst.lo limits.lo locale-inst.lo locale.lo localename.lo \
|
||||
messages.lo misc-inst.lo monetary.lo numeric.lo ostream-inst.lo \
|
||||
libstdc___la_OBJECTS = bitset.lo codecvt.lo complex_io.lo \
|
||||
concept-inst.lo ctype.lo ext-inst.lo fstream.lo fstream-inst.lo \
|
||||
functexcept.lo globals.lo io-inst.lo ios.lo istream-inst.lo limits.lo \
|
||||
locale.lo locale-inst.lo localename.lo misc-inst.lo ostream-inst.lo \
|
||||
sstream-inst.lo stdexcept.lo stl-inst.lo streambuf-inst.lo \
|
||||
string-inst.lo strstream.lo time.lo valarray-inst.lo vterminate.lo \
|
||||
wstring-inst.lo
|
||||
string-inst.lo strstream.lo valarray-inst.lo vterminate.lo \
|
||||
wstring-inst.lo codecvt_members.lo collate_members.lo ctype_members.lo \
|
||||
messages_members.lo monetary_members.lo numeric_members.lo \
|
||||
time_members.lo basic_file.lo c++locale.lo
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
|
||||
CXXLD = $(CXX)
|
||||
|
||||
@ -2,22 +2,21 @@
|
||||
|
||||
// Copyright (C) 2001, 2002 Free Software Foundation
|
||||
//
|
||||
// This file is part of GNU CC.
|
||||
//
|
||||
// GNU CC is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2, or (at your option)
|
||||
// This file is part of the GNU ISO C++ Library. This library is free
|
||||
// software; you can redistribute it and/or modify it under the
|
||||
// terms of the GNU General Public License as published by the
|
||||
// Free Software Foundation; either version 2, or (at your option)
|
||||
// any later version.
|
||||
//
|
||||
// GNU CC is distributed in the hope that it will be useful,
|
||||
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with GNU CC; see the file COPYING. If not, write to
|
||||
// the Free Software Foundation, 59 Temple Place - Suite 330,
|
||||
// Boston, MA 02111-1307, USA.
|
||||
|
||||
// You should have received a copy of the GNU General Public License along
|
||||
// with this library; see the file COPYING. If not, write to the Free
|
||||
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
||||
// USA.
|
||||
|
||||
// As a special exception, you may use this file as part of a free software
|
||||
// library without restriction. Specifically, if other files instantiate
|
||||
|
||||
@ -31,6 +31,13 @@
|
||||
|
||||
namespace std
|
||||
{
|
||||
// Definitions for locale::id of standard facets that are specialized.
|
||||
locale::id codecvt<char, char, mbstate_t>::id;
|
||||
|
||||
#ifdef _GLIBCPP_USE_WCHAR_T
|
||||
locale::id codecvt<wchar_t, char, mbstate_t>::id;
|
||||
#endif
|
||||
|
||||
#ifdef _GLIBCPP_USE___ENC_TRAITS
|
||||
// Definitions for static const data members of __enc_traits.
|
||||
const int __enc_traits::_S_max_size;
|
||||
@ -130,41 +137,6 @@ namespace std
|
||||
_S_destroy_c_locale(_M_c_locale_codecvt);
|
||||
}
|
||||
|
||||
codecvt_base::result
|
||||
codecvt<wchar_t, char, mbstate_t>::
|
||||
do_out(state_type& __state, const intern_type* __from,
|
||||
const intern_type* __from_end, const intern_type*& __from_next,
|
||||
extern_type* __to, extern_type* __to_end,
|
||||
extern_type*& __to_next) const
|
||||
{
|
||||
result __ret = error;
|
||||
size_t __len = min(__from_end - __from, __to_end - __to);
|
||||
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
|
||||
__c_locale __old = __uselocale(_M_c_locale_codecvt);
|
||||
#endif
|
||||
size_t __conv = wcsrtombs(__to, &__from, __len, &__state);
|
||||
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
|
||||
__uselocale(__old);
|
||||
#endif
|
||||
|
||||
if (__conv == __len)
|
||||
{
|
||||
__from_next = __from;
|
||||
__to_next = __to + __conv;
|
||||
__ret = ok;
|
||||
}
|
||||
else if (__conv > 0 && __conv < __len)
|
||||
{
|
||||
__from_next = __from;
|
||||
__to_next = __to + __conv;
|
||||
__ret = partial;
|
||||
}
|
||||
else
|
||||
__ret = error;
|
||||
|
||||
return __ret;
|
||||
}
|
||||
|
||||
codecvt_base::result
|
||||
codecvt<wchar_t, char, mbstate_t>::
|
||||
do_unshift(state_type&, extern_type* __to,
|
||||
@ -174,41 +146,6 @@ namespace std
|
||||
return noconv;
|
||||
}
|
||||
|
||||
codecvt_base::result
|
||||
codecvt<wchar_t, char, mbstate_t>::
|
||||
do_in(state_type& __state, const extern_type* __from,
|
||||
const extern_type* __from_end, const extern_type*& __from_next,
|
||||
intern_type* __to, intern_type* __to_end,
|
||||
intern_type*& __to_next) const
|
||||
{
|
||||
result __ret = error;
|
||||
size_t __len = min(__from_end - __from, __to_end - __to);
|
||||
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
|
||||
__c_locale __old = __uselocale(_M_c_locale_codecvt);
|
||||
#endif
|
||||
size_t __conv = mbsrtowcs(__to, &__from, __len, &__state);
|
||||
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
|
||||
__uselocale(__old);
|
||||
#endif
|
||||
|
||||
if (__conv == __len)
|
||||
{
|
||||
__from_next = __from;
|
||||
__to_next = __to + __conv;
|
||||
__ret = ok;
|
||||
}
|
||||
else if (__conv > 0 && __conv < __len)
|
||||
{
|
||||
__from_next = __from;
|
||||
__to_next = __to + __conv;
|
||||
__ret = partial;
|
||||
}
|
||||
else
|
||||
__ret = error;
|
||||
|
||||
return __ret;
|
||||
}
|
||||
|
||||
int
|
||||
codecvt<wchar_t, char, mbstate_t>::
|
||||
do_encoding() const throw()
|
||||
|
||||
@ -2,22 +2,21 @@
|
||||
|
||||
// Copyright (C) 2001, 2002 Free Software Foundation
|
||||
//
|
||||
// This file is part of GNU CC.
|
||||
//
|
||||
// GNU CC is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2, or (at your option)
|
||||
// This file is part of the GNU ISO C++ Library. This library is free
|
||||
// software; you can redistribute it and/or modify it under the
|
||||
// terms of the GNU General Public License as published by the
|
||||
// Free Software Foundation; either version 2, or (at your option)
|
||||
// any later version.
|
||||
//
|
||||
// GNU CC is distributed in the hope that it will be useful,
|
||||
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with GNU CC; see the file COPYING. If not, write to
|
||||
// the Free Software Foundation, 59 Temple Place - Suite 330,
|
||||
// Boston, MA 02111-1307, USA.
|
||||
|
||||
// You should have received a copy of the GNU General Public License along
|
||||
// with this library; see the file COPYING. If not, write to the Free
|
||||
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
||||
// USA.
|
||||
|
||||
// As a special exception, you may use this file as part of a free software
|
||||
// library without restriction. Specifically, if other files instantiate
|
||||
|
||||
153
libstdc++-v3/src/ctype.cc
Normal file
153
libstdc++-v3/src/ctype.cc
Normal file
@ -0,0 +1,153 @@
|
||||
// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
|
||||
// Free Software Foundation, Inc.
|
||||
//
|
||||
// This file is part of the GNU ISO C++ Library. This library is free
|
||||
// software; you can redistribute it and/or modify it under the
|
||||
// terms of the GNU General Public License as published by the
|
||||
// Free Software Foundation; either version 2, or (at your option)
|
||||
// any later version.
|
||||
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License along
|
||||
// with this library; see the file COPYING. If not, write to the Free
|
||||
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
||||
// USA.
|
||||
|
||||
// As a special exception, you may use this file as part of a free software
|
||||
// library without restriction. Specifically, if other files instantiate
|
||||
// templates or use macros or inline functions from this file, or you compile
|
||||
// this file and link it with other files to produce an executable, this
|
||||
// file does not by itself cause the resulting executable to be covered by
|
||||
// the GNU General Public License. This exception does not however
|
||||
// invalidate any other reasons why the executable file might be covered by
|
||||
// the GNU General Public License.
|
||||
|
||||
#include <locale>
|
||||
|
||||
namespace std
|
||||
{
|
||||
// XXX At some point, just rename this file to ctype_members_char.cc
|
||||
// and compile it as a separate file instead of including it here.
|
||||
// Platform-specific initialization code for ctype tables.
|
||||
#include <bits/ctype_noninline.h>
|
||||
|
||||
// Definitions for locale::id of standard facets that are specialized.
|
||||
locale::id ctype<char>::id;
|
||||
|
||||
#ifdef _GLIBCPP_USE_WCHAR_T
|
||||
locale::id ctype<wchar_t>::id;
|
||||
#endif
|
||||
|
||||
template<>
|
||||
const ctype<char>&
|
||||
use_facet<ctype<char> >(const locale& __loc)
|
||||
{
|
||||
size_t __i = ctype<char>::id._M_id();
|
||||
const locale::_Impl* __tmp = __loc._M_impl;
|
||||
return static_cast<const ctype<char>&>(*(__tmp->_M_facets[__i]));
|
||||
}
|
||||
|
||||
#ifdef _GLIBCPP_USE_WCHAR_T
|
||||
template<>
|
||||
const ctype<wchar_t>&
|
||||
use_facet<ctype<wchar_t> >(const locale& __loc)
|
||||
{
|
||||
size_t __i = ctype<wchar_t>::id._M_id();
|
||||
const locale::_Impl* __tmp = __loc._M_impl;
|
||||
return static_cast<const ctype<wchar_t>&>(*(__tmp->_M_facets[__i]));
|
||||
}
|
||||
#endif
|
||||
|
||||
// Definitions for static const data members of ctype_base.
|
||||
const ctype_base::mask ctype_base::space;
|
||||
const ctype_base::mask ctype_base::print;
|
||||
const ctype_base::mask ctype_base::cntrl;
|
||||
const ctype_base::mask ctype_base::upper;
|
||||
const ctype_base::mask ctype_base::lower;
|
||||
const ctype_base::mask ctype_base::alpha;
|
||||
const ctype_base::mask ctype_base::digit;
|
||||
const ctype_base::mask ctype_base::punct;
|
||||
const ctype_base::mask ctype_base::xdigit;
|
||||
const ctype_base::mask ctype_base::alnum;
|
||||
const ctype_base::mask ctype_base::graph;
|
||||
|
||||
const size_t ctype<char>::table_size;
|
||||
|
||||
ctype<char>::~ctype()
|
||||
{
|
||||
if (_M_c_locale_ctype != _S_c_locale)
|
||||
_S_destroy_c_locale(_M_c_locale_ctype);
|
||||
if (_M_del)
|
||||
delete[] this->table();
|
||||
}
|
||||
|
||||
// These are dummy placeholders as these virtual functions are never called.
|
||||
bool
|
||||
ctype<char>::do_is(mask, char_type) const
|
||||
{ return false; }
|
||||
|
||||
const char*
|
||||
ctype<char>::do_is(const char_type* __c, const char_type*, mask*) const
|
||||
{ return __c; }
|
||||
|
||||
const char*
|
||||
ctype<char>::do_scan_is(mask, const char_type* __c, const char_type*) const
|
||||
{ return __c; }
|
||||
|
||||
const char*
|
||||
ctype<char>::do_scan_not(mask, const char_type* __c, const char_type*) const
|
||||
{ return __c; }
|
||||
|
||||
char
|
||||
ctype<char>::do_widen(char __c) const
|
||||
{ return __c; }
|
||||
|
||||
const char*
|
||||
ctype<char>::do_widen(const char* __lo, const char* __hi, char* __dest) const
|
||||
{
|
||||
memcpy(__dest, __lo, __hi - __lo);
|
||||
return __hi;
|
||||
}
|
||||
|
||||
char
|
||||
ctype<char>::do_narrow(char __c, char /*__dfault*/) const
|
||||
{ return __c; }
|
||||
|
||||
const char*
|
||||
ctype<char>::do_narrow(const char* __lo, const char* __hi,
|
||||
char /*__dfault*/, char* __dest) const
|
||||
{
|
||||
memcpy(__dest, __lo, __hi - __lo);
|
||||
return __hi;
|
||||
}
|
||||
|
||||
#ifdef _GLIBCPP_USE_WCHAR_T
|
||||
ctype<wchar_t>::ctype(size_t __refs)
|
||||
: __ctype_abstract_base<wchar_t>(__refs)
|
||||
{ _M_c_locale_ctype = _S_c_locale; }
|
||||
|
||||
ctype<wchar_t>::ctype(__c_locale __cloc, size_t __refs)
|
||||
: __ctype_abstract_base<wchar_t>(__refs)
|
||||
{ _M_c_locale_ctype = _S_clone_c_locale(__cloc); }
|
||||
|
||||
ctype<wchar_t>::~ctype()
|
||||
{
|
||||
if (_M_c_locale_ctype != _S_c_locale)
|
||||
_S_destroy_c_locale(_M_c_locale_ctype);
|
||||
}
|
||||
|
||||
template<>
|
||||
ctype_byname<wchar_t>::ctype_byname(const char* __s, size_t __refs)
|
||||
: ctype<wchar_t>(__refs)
|
||||
{
|
||||
if (_M_c_locale_ctype != _S_c_locale)
|
||||
_S_destroy_c_locale(_M_c_locale_ctype);
|
||||
_S_create_c_locale(_M_c_locale_ctype, __s);
|
||||
}
|
||||
#endif
|
||||
} // namespace std
|
||||
|
||||
@ -59,15 +59,6 @@ namespace std
|
||||
locale::_Impl* locale::_S_global;
|
||||
const size_t locale::_S_num_categories;
|
||||
|
||||
// Definitions for locale::id of standard facets that are specialized.
|
||||
locale::id ctype<char>::id;
|
||||
locale::id codecvt<char, char, mbstate_t>::id;
|
||||
|
||||
#ifdef _GLIBCPP_USE_WCHAR_T
|
||||
locale::id ctype<wchar_t>::id;
|
||||
locale::id codecvt<wchar_t, char, mbstate_t>::id;
|
||||
#endif
|
||||
|
||||
// Definitions for static const data members of locale::id
|
||||
_Atomic_word locale::id::_S_highwater; // init'd to 0 by linker
|
||||
|
||||
@ -397,97 +388,6 @@ namespace std
|
||||
locale::id::id()
|
||||
{ }
|
||||
|
||||
// Definitions for static const data members of ctype_base.
|
||||
const ctype_base::mask ctype_base::space;
|
||||
const ctype_base::mask ctype_base::print;
|
||||
const ctype_base::mask ctype_base::cntrl;
|
||||
const ctype_base::mask ctype_base::upper;
|
||||
const ctype_base::mask ctype_base::lower;
|
||||
const ctype_base::mask ctype_base::alpha;
|
||||
const ctype_base::mask ctype_base::digit;
|
||||
const ctype_base::mask ctype_base::punct;
|
||||
const ctype_base::mask ctype_base::xdigit;
|
||||
const ctype_base::mask ctype_base::alnum;
|
||||
const ctype_base::mask ctype_base::graph;
|
||||
|
||||
// Platform-specific initialization code for ctype tables.
|
||||
#include <bits/ctype_noninline.h>
|
||||
|
||||
const size_t ctype<char>::table_size;
|
||||
|
||||
ctype<char>::~ctype()
|
||||
{
|
||||
if (_M_c_locale_ctype != _S_c_locale)
|
||||
_S_destroy_c_locale(_M_c_locale_ctype);
|
||||
if (_M_del)
|
||||
delete[] this->table();
|
||||
}
|
||||
|
||||
// These are dummy placeholders as these virtual functions are never called.
|
||||
bool
|
||||
ctype<char>::do_is(mask, char_type) const
|
||||
{ return false; }
|
||||
|
||||
const char*
|
||||
ctype<char>::do_is(const char_type* __c, const char_type*, mask*) const
|
||||
{ return __c; }
|
||||
|
||||
const char*
|
||||
ctype<char>::do_scan_is(mask, const char_type* __c, const char_type*) const
|
||||
{ return __c; }
|
||||
|
||||
const char*
|
||||
ctype<char>::do_scan_not(mask, const char_type* __c, const char_type*) const
|
||||
{ return __c; }
|
||||
|
||||
char
|
||||
ctype<char>::do_widen(char __c) const
|
||||
{ return __c; }
|
||||
|
||||
const char*
|
||||
ctype<char>::do_widen(const char* __lo, const char* __hi, char* __dest) const
|
||||
{
|
||||
memcpy(__dest, __lo, __hi - __lo);
|
||||
return __hi;
|
||||
}
|
||||
|
||||
char
|
||||
ctype<char>::do_narrow(char __c, char /*__dfault*/) const
|
||||
{ return __c; }
|
||||
|
||||
const char*
|
||||
ctype<char>::do_narrow(const char* __lo, const char* __hi,
|
||||
char /*__dfault*/, char* __dest) const
|
||||
{
|
||||
memcpy(__dest, __lo, __hi - __lo);
|
||||
return __hi;
|
||||
}
|
||||
|
||||
#ifdef _GLIBCPP_USE_WCHAR_T
|
||||
ctype<wchar_t>::ctype(size_t __refs)
|
||||
: __ctype_abstract_base<wchar_t>(__refs)
|
||||
{ _M_c_locale_ctype = _S_c_locale; }
|
||||
|
||||
ctype<wchar_t>::ctype(__c_locale __cloc, size_t __refs)
|
||||
: __ctype_abstract_base<wchar_t>(__refs)
|
||||
{ _M_c_locale_ctype = _S_clone_c_locale(__cloc); }
|
||||
|
||||
ctype<wchar_t>::~ctype()
|
||||
{
|
||||
if (_M_c_locale_ctype != _S_c_locale)
|
||||
_S_destroy_c_locale(_M_c_locale_ctype);
|
||||
}
|
||||
|
||||
template<>
|
||||
ctype_byname<wchar_t>::ctype_byname(const char* __s, size_t __refs)
|
||||
: ctype<wchar_t>(__refs)
|
||||
{
|
||||
if (_M_c_locale_ctype != _S_c_locale)
|
||||
_S_destroy_c_locale(_M_c_locale_ctype);
|
||||
_S_create_c_locale(_M_c_locale_ctype, __s);
|
||||
}
|
||||
#endif
|
||||
|
||||
// Definitions for static const data members of time_base
|
||||
template<>
|
||||
const char*
|
||||
@ -511,26 +411,6 @@ namespace std
|
||||
const money_base::pattern
|
||||
money_base::_S_default_pattern = { {symbol, sign, none, value} };
|
||||
|
||||
template<>
|
||||
const ctype<char>&
|
||||
use_facet<ctype<char> >(const locale& __loc)
|
||||
{
|
||||
size_t __i = ctype<char>::id._M_id();
|
||||
const locale::_Impl* __tmp = __loc._M_impl;
|
||||
return static_cast<const ctype<char>&>(*(__tmp->_M_facets[__i]));
|
||||
}
|
||||
|
||||
#ifdef _GLIBCPP_USE_WCHAR_T
|
||||
template<>
|
||||
const ctype<wchar_t>&
|
||||
use_facet<ctype<wchar_t> >(const locale& __loc)
|
||||
{
|
||||
size_t __i = ctype<wchar_t>::id._M_id();
|
||||
const locale::_Impl* __tmp = __loc._M_impl;
|
||||
return static_cast<const ctype<wchar_t>&>(*(__tmp->_M_facets[__i]));
|
||||
}
|
||||
#endif
|
||||
|
||||
const char __num_base::_S_atoms[] = "0123456789eEabcdfABCDF";
|
||||
|
||||
bool
|
||||
|
||||
@ -2,22 +2,21 @@
|
||||
|
||||
// Copyright (C) 2001, 2002 Free Software Foundation
|
||||
//
|
||||
// This file is part of GNU CC.
|
||||
//
|
||||
// GNU CC is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2, or (at your option)
|
||||
// This file is part of the GNU ISO C++ Library. This library is free
|
||||
// software; you can redistribute it and/or modify it under the
|
||||
// terms of the GNU General Public License as published by the
|
||||
// Free Software Foundation; either version 2, or (at your option)
|
||||
// any later version.
|
||||
//
|
||||
// GNU CC is distributed in the hope that it will be useful,
|
||||
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with GNU CC; see the file COPYING. If not, write to
|
||||
// the Free Software Foundation, 59 Temple Place - Suite 330,
|
||||
// Boston, MA 02111-1307, USA.
|
||||
|
||||
// You should have received a copy of the GNU General Public License along
|
||||
// with this library; see the file COPYING. If not, write to the Free
|
||||
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
||||
// USA.
|
||||
|
||||
// As a special exception, you may use this file as part of a free software
|
||||
// library without restriction. Specifically, if other files instantiate
|
||||
|
||||
@ -2,22 +2,21 @@
|
||||
|
||||
// Copyright (C) 2001, 2002 Free Software Foundation
|
||||
//
|
||||
// This file is part of GNU CC.
|
||||
//
|
||||
// GNU CC is free software; you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 2, or (at your option)
|
||||
// This file is part of the GNU ISO C++ Library. This library is free
|
||||
// software; you can redistribute it and/or modify it under the
|
||||
// terms of the GNU General Public License as published by the
|
||||
// Free Software Foundation; either version 2, or (at your option)
|
||||
// any later version.
|
||||
//
|
||||
// GNU CC is distributed in the hope that it will be useful,
|
||||
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with GNU CC; see the file COPYING. If not, write to
|
||||
// the Free Software Foundation, 59 Temple Place - Suite 330,
|
||||
// Boston, MA 02111-1307, USA.
|
||||
|
||||
// You should have received a copy of the GNU General Public License along
|
||||
// with this library; see the file COPYING. If not, write to the Free
|
||||
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
||||
// USA.
|
||||
|
||||
// As a special exception, you may use this file as part of a free software
|
||||
// library without restriction. Specifically, if other files instantiate
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
@ -136,10 +136,14 @@ AUTOMAKE_OPTIONS = cygnus dejagnu
|
||||
|
||||
DEJATOOL = libstdc++-v3
|
||||
|
||||
EXPECT = `if [ -f @glibcpp_builddir@/../../expect/expect ] ; then echo @glibcpp_builddir@/../../expect/expect ; else echo expect ; fi`
|
||||
EXPECT = `if [ -f @glibcpp_builddir@/../../expect/expect ] ; then \
|
||||
echo @glibcpp_builddir@/../../expect/expect ; \
|
||||
else echo expect ; fi`
|
||||
|
||||
|
||||
RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then echo @glibcpp_srcdir@/../dejagnu/runtest ; else echo runtest; fi`
|
||||
RUNTEST = `if [ -f @glibcpp_srcdir@/../dejagnu/runtest ] ; then \
|
||||
echo @glibcpp_srcdir@/../dejagnu/runtest ; \
|
||||
else echo runtest; fi`
|
||||
|
||||
|
||||
AM_RUNTESTFLAGS =
|
||||
@ -147,15 +151,20 @@ RUNTESTFLAGS =
|
||||
|
||||
CXX_fake = @glibcpp_CXX@
|
||||
CXX = `echo $(CXX_fake) | sed 's/xgcc/g++/g'`
|
||||
CXXLINK = LD_RUN_PATH=${LD_RUN_PATH:+$LD_RUN_PATH:}${glibcpp_builddir}/src/.libs $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
|
||||
CXXLINK = \
|
||||
LD_RUN_PATH=${LD_RUN_PATH:+$LD_RUN_PATH:}${glibcpp_builddir}/src/.libs\
|
||||
$(LIBTOOL) --tag=CXX --mode=link $(CXX) \
|
||||
$(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
|
||||
|
||||
|
||||
INCLUDES = -nostdinc++ @GLIBCPP_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@
|
||||
INCLUDES = \
|
||||
-nostdinc++ \
|
||||
@GLIBCPP_INCLUDES@ @LIBSUPCXX_INCLUDES@ @TOPLEVEL_INCLUDES@
|
||||
|
||||
|
||||
noinst_LIBRARIES = libv3test.a
|
||||
libv3test_a_SOURCES = testsuite_hooks.cc
|
||||
@GLIBCPP_BUILD_ABI_CHECK_TRUE@noinst_PROGRAMS = abi_check
|
||||
@GLIBCPP_BUILD_ABI_CHECK_TRUE@noinst_PROGRAMS = @GLIBCPP_BUILD_ABI_CHECK_TRUE@abi_check
|
||||
@GLIBCPP_BUILD_ABI_CHECK_FALSE@noinst_PROGRAMS =
|
||||
abi_check_SOURCES = abi_check.cc
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
|
||||
@ -186,7 +195,7 @@ DIST_COMMON = README Makefile.am Makefile.in
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = tar
|
||||
TAR = gtar
|
||||
GZIP_ENV = --best
|
||||
SOURCES = $(libv3test_a_SOURCES) $(abi_check_SOURCES)
|
||||
OBJECTS = $(libv3test_a_OBJECTS) $(abi_check_OBJECTS)
|
||||
@ -297,7 +306,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
|
||||
awk ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|
||||
|| (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
|
||||
|| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
|
||||
|
||||
mostlyclean-tags:
|
||||
|
||||
@ -354,7 +363,7 @@ site.exp: Makefile
|
||||
@echo 'set build_alias $(build_alias)' >> $@-t
|
||||
@echo 'set build_triplet $(build_triplet)' >> $@-t
|
||||
@echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t
|
||||
@test ! -f $(srcdir)/site.exp || sed '1,/^## All variables above are.*##/ d' $(srcdir)/site.exp >> $@-t
|
||||
@test ! -f site.exp || sed '1,/^## All variables above are.*##/ d' site.exp >> $@-t
|
||||
@test ! -f site.exp || mv site.exp site.bak
|
||||
@mv $@-t site.exp
|
||||
info-am:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user