From 9edacf9fa94fb44283bf99154ca8294fc2556f6f Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Thu, 16 Jul 2015 21:02:06 +0000 Subject: [PATCH] ICU-11771 move FilteredBreakIterator from i18n to common X-SVN-Rev: 37676 --- icu4c/source/common/Makefile.in | 2 +- icu4c/source/common/common.vcxproj | 6 ++++-- icu4c/source/common/common.vcxproj.filters | 6 ++++++ icu4c/source/{i18n => common}/filteredbrk.cpp | 6 +++--- .../{i18n => common}/unicode/filteredbrk.h | 4 ++-- icu4c/source/i18n/Makefile.in | 2 +- icu4c/source/i18n/i18n.vcxproj | 4 +--- icu4c/source/i18n/i18n.vcxproj.filters | 10 +--------- icu4c/source/test/depstest/dependencies.txt | 17 +++++------------ 9 files changed, 24 insertions(+), 33 deletions(-) rename icu4c/source/{i18n => common}/filteredbrk.cpp (98%) rename icu4c/source/{i18n => common}/unicode/filteredbrk.h (97%) diff --git a/icu4c/source/common/Makefile.in b/icu4c/source/common/Makefile.in index 4ac4dc22bf..081aa5388c 100644 --- a/icu4c/source/common/Makefile.in +++ b/icu4c/source/common/Makefile.in @@ -99,7 +99,7 @@ chariter.o schriter.o uchriter.o uiter.o \ patternprops.o uchar.o uprops.o ucase.o propname.o ubidi_props.o ubidi.o ubidiwrt.o ubidiln.o ushape.o \ uscript.o uscript_props.o usc_impl.o unames.o \ utrie.o utrie2.o utrie2_builder.o bmpset.o unisetspan.o uset_props.o uniset_props.o uniset_closure.o uset.o uniset.o usetiter.o ruleiter.o caniter.o unifilt.o unifunct.o \ -uarrsort.o brkiter.o ubrk.o brkeng.o dictbe.o \ +uarrsort.o brkiter.o ubrk.o brkeng.o dictbe.o filteredbrk.o \ rbbi.o rbbidata.o rbbinode.o rbbirb.o rbbiscan.o rbbisetb.o rbbistbl.o rbbitblb.o \ serv.o servnotf.o servls.o servlk.o servlkf.o servrbf.o servslkf.o \ uidna.o usprep.o uts46.o punycode.o \ diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj index 74ce58faa5..9c7f69ed8a 100644 --- a/icu4c/source/common/common.vcxproj +++ b/icu4c/source/common/common.vcxproj @@ -232,6 +232,7 @@ + @@ -398,7 +399,7 @@ - false + false @@ -624,6 +625,7 @@ ..\..\include\unicode\%(Filename)%(Extension);%(Outputs) + @@ -1769,4 +1771,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/common/common.vcxproj.filters b/icu4c/source/common/common.vcxproj.filters index 06f89f5f93..2e0f7c9e3e 100644 --- a/icu4c/source/common/common.vcxproj.filters +++ b/icu4c/source/common/common.vcxproj.filters @@ -575,6 +575,9 @@ locales & resources + + break iteration + @@ -862,6 +865,9 @@ properties & sets + + break iteration + diff --git a/icu4c/source/i18n/filteredbrk.cpp b/icu4c/source/common/filteredbrk.cpp similarity index 98% rename from icu4c/source/i18n/filteredbrk.cpp rename to icu4c/source/common/filteredbrk.cpp index 7ecb004b3f..0eec648d18 100644 --- a/icu4c/source/i18n/filteredbrk.cpp +++ b/icu4c/source/common/filteredbrk.cpp @@ -1,6 +1,6 @@ /* ******************************************************************************* -* Copyright (C) 2014, International Business Machines Corporation and +* Copyright (C) 2014-2015, International Business Machines Corporation and * others. All Rights Reserved. ******************************************************************************* */ @@ -52,7 +52,7 @@ static int8_t U_CALLCONV compareUnicodeString(UElement t1, UElement t2) { /** * A UVector which implements a set of strings. */ -class U_I18N_API UStringSet : public UVector { +class U_COMMON_API UStringSet : public UVector { public: UStringSet(UErrorCode &status) : UVector(uprv_deleteUObject, uhash_compareUnicodeString, @@ -298,7 +298,7 @@ int32_t SimpleFilteredSentenceBreakIterator::next() { /** * Concrete implementation of builder class. */ -class U_I18N_API SimpleFilteredBreakIteratorBuilder : public FilteredBreakIteratorBuilder { +class U_COMMON_API SimpleFilteredBreakIteratorBuilder : public FilteredBreakIteratorBuilder { public: virtual ~SimpleFilteredBreakIteratorBuilder(); SimpleFilteredBreakIteratorBuilder(const Locale &fromLocale, UErrorCode &status); diff --git a/icu4c/source/i18n/unicode/filteredbrk.h b/icu4c/source/common/unicode/filteredbrk.h similarity index 97% rename from icu4c/source/i18n/unicode/filteredbrk.h rename to icu4c/source/common/unicode/filteredbrk.h index 1412418be5..a1a5719538 100644 --- a/icu4c/source/i18n/unicode/filteredbrk.h +++ b/icu4c/source/common/unicode/filteredbrk.h @@ -1,6 +1,6 @@ /* ******************************************************************************** -* Copyright (C) 1997-2014, International Business Machines +* Copyright (C) 1997-2015, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************** */ @@ -44,7 +44,7 @@ U_NAMESPACE_BEGIN * * @internal technology preview */ -class U_I18N_API FilteredBreakIteratorBuilder : public UObject { +class U_COMMON_API FilteredBreakIteratorBuilder : public UObject { public: /** * destructor. diff --git a/icu4c/source/i18n/Makefile.in b/icu4c/source/i18n/Makefile.in index bb730d6a44..ece8e54a0b 100644 --- a/icu4c/source/i18n/Makefile.in +++ b/icu4c/source/i18n/Makefile.in @@ -94,7 +94,7 @@ uspoof.o uspoof_impl.o uspoof_build.o uspoof_conf.o uspoof_wsconf.o decfmtst.o s ztrans.o zrule.o vzone.o fphdlimp.o fpositer.o ufieldpositer.o locdspnm.o \ decNumber.o decContext.o alphaindex.o tznames.o tznames_impl.o tzgnames.o \ tzfmt.o compactdecimalformat.o gender.o region.o scriptset.o identifier_info.o \ -uregion.o reldatefmt.o quantityformatter.o measunit.o filteredbrk.o \ +uregion.o reldatefmt.o quantityformatter.o measunit.o \ sharedbreakiterator.o scientificnumberformatter.o ## Header files to install diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj index dd9aa80aef..b668cf6089 100644 --- a/icu4c/source/i18n/i18n.vcxproj +++ b/icu4c/source/i18n/i18n.vcxproj @@ -244,7 +244,6 @@ - @@ -668,7 +667,6 @@ ..\..\include\unicode\%(Filename)%(Extension);%(Outputs) - @@ -1717,4 +1715,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/i18n/i18n.vcxproj.filters b/icu4c/source/i18n/i18n.vcxproj.filters index 1ea1a78e06..fe836dc1b0 100644 --- a/icu4c/source/i18n/i18n.vcxproj.filters +++ b/icu4c/source/i18n/i18n.vcxproj.filters @@ -510,9 +510,6 @@ formatting - - misc - @@ -1213,9 +1210,4 @@ formatting - - - misc - - - + \ No newline at end of file diff --git a/icu4c/source/test/depstest/dependencies.txt b/icu4c/source/test/depstest/dependencies.txt index 5e0e73468e..23c4a999ce 100644 --- a/icu4c/source/test/depstest/dependencies.txt +++ b/icu4c/source/test/depstest/dependencies.txt @@ -175,6 +175,11 @@ group: breakiterator rbbi.o rbbinode.o rbbiscan.o rbbisetb.o rbbistbl.o rbbitblb.o rbbidata.o rbbirb.o dictionarydata.o dictbe.o + + # Folded 'filteredbrk' in to this group. + # it depends on global new/delete and STL. Not recording these here. + # http://bugs.icu-project.org/trac/ticket/10990 + filteredbrk.o deps resourcebundle service_registration schriter utext uniset_core uniset_props @@ -740,7 +745,6 @@ library: i18n region localedata genderinfo charset_detector spoof_detection alphabetic_index collation collation_builder string_search formatting formattable_cnv regex regex_cnv translit - filteredbreakiterator universal_time_scale uclean_i18n @@ -907,17 +911,6 @@ group: translit formatting # for Transliterator::getDisplayName() uclean_i18n -# This is off by default, UCONFIG_NO_FILTERED_BREAK_ITERATION=0 -# so, you will see warnings: -#Info: group filteredbreakiterator does not need to depend on breakiterator -#Info: group filteredbreakiterator does not need to depend on ucharstriebuilder -group: filteredbreakiterator - filteredbrk.o - deps - breakiterator ucharstriebuilder - # depends on global new/delete and STL. Not recording these here. - # http://bugs.icu-project.org/trac/ticket/10990 - group: universal_time_scale utmscale.o