organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-13754 Move listformatter from common to i18n (#96)

Browse source
This commit is contained in:
Frank Tang 2018-09-06 13:31:40 -07:00 • committed by Shane Carr
parent 0c89ed5c65
commit e6a5f0ee0a
No known key found for this signature in database
GPG key ID: FCED3B24AAB18B5C
14 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/common/Makefile.in
View file

@ -109,7 +109,7 @@ rbbi.o rbbidata.o rbbinode.o rbbirb.o rbbiscan.o rbbisetb.o rbbistbl.o rbbitblb.
serv.o servnotf.o servls.o servlk.o servlkf.o servrbf.o servslkf.o \
uidna.o usprep.o uts46.o punycode.o \
util.o util_props.o parsepos.o locbased.o cwchar.o wintz.o dtintrv.o ucnvsel.o propsvec.o \
ulist.o uloc_tag.o icudataver.o icuplug.o listformatter.o ulistformatter.o \
ulist.o uloc_tag.o icudataver.o icuplug.o \
sharedobject.o simpleformatter.o unifiedcache.o uloc_keytype.o \
ubiditransform.o \
pluralmap.o \

4
icu4c/source/common/common.vcxproj
View file

@ -334,8 +334,6 @@
<ClCompile Include="ustrtrns.cpp" />
<ClCompile Include="utext.cpp" />
<ClCompile Include="utf_impl.cpp" />
<ClCompile Include="listformatter.cpp" />
<ClCompile Include="ulistformatter.cpp" />
<ClCompile Include="static_unicode_sets.cpp" />
<ClInclude Include="localsvc.h" />
<ClInclude Include="msvcres.h" />
@ -452,4 +450,4 @@
<Import Project="$(SolutionDir)\Windows.CopyUnicodeHeaderFiles.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

12
icu4c/source/common/common.vcxproj.filters
View file

@ -565,12 +565,6 @@
<ClCompile Include="bytestriebuilder.cpp">
<Filter>collections</Filter>
</ClCompile>
<ClCompile Include="listformatter.cpp">
<Filter>formatting</Filter>
</ClCompile>
<ClCompile Include="ulistformatter.cpp">
<Filter>formatting</Filter>
</ClCompile>
<ClCompile Include="messagepattern.cpp">
<Filter>formatting</Filter>
</ClCompile>
@ -1195,12 +1189,6 @@
<CustomBuild Include="unicode\messagepattern.h">
<Filter>formatting</Filter>
</CustomBuild>
<CustomBuild Include="unicode\listformatter.h">
<Filter>formatting</Filter>
</CustomBuild>
<CustomBuild Include="unicode\ulistformatter.h">
<Filter>formatting</Filter>
</CustomBuild>
<CustomBuild Include="unicode\appendable.h">
<Filter>strings</Filter>
</CustomBuild>

2
icu4c/source/common/common_uwp.vcxproj
View file

@ -458,8 +458,6 @@
<ClCompile Include="ustrtrns.cpp" />
<ClCompile Include="utext.cpp" />
<ClCompile Include="utf_impl.cpp" />
<ClCompile Include="listformatter.cpp" />
<ClCompile Include="ulistformatter.cpp" />
<ClCompile Include="static_unicode_sets.cpp" />
</ItemGroup>
<ItemGroup>

1
icu4c/source/common/ucln_cmn.h
View file

@ -52,7 +52,6 @@ typedef enum ECleanupCommonType {
UCLN_COMMON_UCNV_IO,
UCLN_COMMON_UDATA,
UCLN_COMMON_PUTIL,
UCLN_COMMON_LIST_FORMATTER,
UCLN_COMMON_UINIT,
/*

1
icu4c/source/i18n/Makefile.in
View file

@ -81,6 +81,7 @@ collationsets.o \
collationcompare.o collationfastlatin.o collationkeys.o rulebasedcollator.o collationroot.o \
collationrootelements.o collationdatabuilder.o \
collationweights.o collationruleparser.o collationbuilder.o collationfastlatinbuilder.o \
listformatter.o ulistformatter.o \
strmatch.o usearch.o search.o stsearch.o \
translit.o utrans.o esctrn.o unesctrn.o funcrepl.o strrepl.o tridpars.o \
cpdtrans.o rbt.o rbt_data.o rbt_pars.o rbt_rule.o rbt_set.o \

4
icu4c/source/i18n/i18n.vcxproj
View file

@ -244,6 +244,8 @@
<ClCompile Include="indiancal.cpp" />
<ClCompile Include="islamcal.cpp" />
<ClCompile Include="japancal.cpp" />
<ClCompile Include="listformatter.cpp" />
<ClCompile Include="ulistformatter.cpp" />
<ClCompile Include="measfmt.cpp" />
<ClCompile Include="measunit.cpp" />
<ClCompile Include="measure.cpp" />
@ -557,4 +559,4 @@
<Import Project="$(SolutionDir)\Windows.CopyUnicodeHeaderFiles.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

8
icu4c/source/i18n/i18n.vcxproj.filters
View file

@ -183,6 +183,12 @@
<ClCompile Include="japancal.cpp">
<Filter>formatting</Filter>
</ClCompile>
<ClCompile Include="listformatter.cpp">
<Filter>formatting</Filter>
</ClCompile>
<ClCompile Include="ulistformatter.cpp">
<Filter>formatting</Filter>
</ClCompile>
<ClCompile Include="measfmt.cpp">
<Filter>formatting</Filter>
</ClCompile>
@ -1184,4 +1190,4 @@
<Filter>misc</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
</Project>

2
icu4c/source/i18n/i18n_uwp.vcxproj
View file

@ -351,6 +351,8 @@
<ClCompile Include="indiancal.cpp" />
<ClCompile Include="islamcal.cpp" />
<ClCompile Include="japancal.cpp" />
<ClCompile Include="listformatter.cpp" />
<ClCompile Include="ulistformatter.cpp" />
<ClCompile Include="measfmt.cpp" />
<ClCompile Include="measunit.cpp" />
<ClCompile Include="measure.cpp" />

4
icu4c/source/common/listformatter.cpp → icu4c/source/i18n/listformatter.cpp
View file

@ -23,7 +23,7 @@
#include "cstring.h"
#include "ulocimp.h"
#include "charstr.h"
#include "ucln_cmn.h"
#include "ucln_in.h"
#include "uresimp.h"
#include "resource.h"
@ -114,7 +114,7 @@ void ListFormatter::initializeHash(UErrorCode& errorCode) {
}
listPatternHash->setValueDeleter(uprv_deleteListFormatInternal);
ucln_common_registerCleanup(UCLN_COMMON_LIST_FORMATTER, uprv_listformatter_cleanup);
ucln_i18n_registerCleanup(UCLN_I18N_LIST_FORMATTER, uprv_listformatter_cleanup);
}

1
icu4c/source/i18n/ucln_in.h
View file

@ -58,6 +58,7 @@ typedef enum ECleanupI18NType {
UCLN_I18N_GENDERINFO,
UCLN_I18N_CDFINFO,
UCLN_I18N_REGION,
UCLN_I18N_LIST_FORMATTER,
UCLN_I18N_COUNT /* This must be last */
} ECleanupI18NType;

0
icu4c/source/common/ulistformatter.cpp → icu4c/source/i18n/ulistformatter.cpp
View file

2
icu4c/source/common/unicode/listformatter.h → icu4c/source/i18n/unicode/listformatter.h
View file

@ -65,7 +65,7 @@ struct ListFormatData : public UMemory {
* The ListFormatter class is not intended for public subclassing.
* @stable ICU 50
*/
class U_COMMON_API ListFormatter : public UObject{
class U_I18N_API ListFormatter : public UObject{
public:

0
icu4c/source/common/unicode/ulistformatter.h → icu4c/source/i18n/unicode/ulistformatter.h
View file