diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-08-18 02:53:13 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-08-18 02:53:13 +0000 |
| commit | e3e68d5655b64430dd340b97fab307e10edb1966 (patch) | |
| tree | e7584e40d7eed94eae7c070a823234cb31e6a925 /libstdc++-v3/aclocal.m4 | |
| parent | 8fee6c5ba203062646a84ef04770c79ba2be0a6a (diff) | |
| download | gcc-e3e68d5655b64430dd340b97fab307e10edb1966.tar.gz | |
2001-08-17 Benjamin Kosnik <bkoz@redhat.com>
Implement std::collate.
* config/locale/collate_specializations_gnu.cc: Add here, implement in
MT-safe way.
* config/locale/collate_specializations_generic.cc: Add here, but
in a less sophisticated manner.
* include/bits/locale_facets.tcc (collate): Add generic definition.
* include/bits/locale_facets.h (~collate): Mark virtual.
(collate::_M_compare_helper): New.
(collate::_M_transform_helper): New.
* src/locale.cc: Remove unnecessary specializations.
* src/string-inst.cc: Tweak instantiation of ctors.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Do configury for collate.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* src/Makefile.am (sources): Add collate.cc.
* src/Makefile.in: Regenerate.
* testsuite/22_locale/collate_byname.cc: New.
* testsuite/22_locale/collate.cc: New file.
* testsuite/22_locale/collate_char_members.cc: New file.
* testsuite/22_locale/collate_wchar_t_members.cc: New file.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44996 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/aclocal.m4')
| -rw-r--r-- | libstdc++-v3/aclocal.m4 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 173d411a779..b83c7a76c96 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -1072,6 +1072,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ CCODECVT_H=config/locale/codecvt_specializations_generic.h CMESSAGES_H=config/locale/messages_members_generic.h CMESSAGES_CC=config/locale/messages_members_generic.cc + CCOLLATE_CC=config/locale/collate_specializations_generic.cc ;; xgnu) AC_MSG_RESULT(gnu) @@ -1097,6 +1098,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ CCODECVT_H=config/locale/codecvt_specializations_ieee_1003.1-200x.h CMESSAGES_H=config/locale/messages_members_gnu.h CMESSAGES_CC=config/locale/messages_members_gnu.cc + CCOLLATE_CC=config/locale/collate_specializations_gnu.cc ;; xieee_1003.1) AC_MSG_RESULT(generic) @@ -1109,6 +1111,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ CCODECVT_H=config/locale/codecvt_specializations_ieee_1003.1-200x.h CMESSAGES_H=config/locale/messages_members_ieee_1003.1-200x.h CMESSAGES_CC=config/locale/messages_members_ieee_1003.1-200x.cc + CCOLLATE_CC=config/locale/collate_specializations_generic.cc ;; *) echo "$enable_clocale is an unknown locale package" 1>&2 @@ -1126,7 +1129,8 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ AC_SUBST(CCODECVT_H) AC_SUBST(CMESSAGES_H) AC_LINK_FILES($CLOCALE_CC, src/c++locale.cc) - AC_LINK_FILES($CMESSAGES_CC, src/messages_members.cc) + AC_LINK_FILES($CMESSAGES_CC, src/messages.cc) + AC_LINK_FILES($CCOLLATE_CC, src/collate.cc) ]) |