From aad0b5d0f3020dfd12a3e487173c9d270e622ed3 Mon Sep 17 00:00:00 2001 From: John Emmons Date: Mon, 14 Jan 2013 19:06:31 +0000 Subject: [PATCH] ICU-8451 Add region objects to Makefiles - remove one unnecessary line in region.cpp X-SVN-Rev: 33049 --- icu4c/source/i18n/Makefile.in | 4 ++-- icu4c/source/i18n/region.cpp | 1 - icu4c/source/test/intltest/Makefile.in | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/icu4c/source/i18n/Makefile.in b/icu4c/source/i18n/Makefile.in index a8cfef606a7..253427eabe3 100644 --- a/icu4c/source/i18n/Makefile.in +++ b/icu4c/source/i18n/Makefile.in @@ -1,6 +1,6 @@ #****************************************************************************** # -# Copyright (C) 1998-2012, International Business Machines +# Copyright (C) 1998-2013, International Business Machines # Corporation and others. All Rights Reserved. # #****************************************************************************** @@ -86,7 +86,7 @@ tmunit.o tmutamt.o tmutfmt.o currpinf.o \ uspoof.o uspoof_impl.o uspoof_build.o uspoof_conf.o uspoof_wsconf.o decfmtst.o smpdtfst.o \ ztrans.o zrule.o vzone.o fphdlimp.o fpositer.o locdspnm.o \ decNumber.o decContext.o alphaindex.o tznames.o tznames_impl.o tzgnames.o \ -tzfmt.o compactdecimalformat.o gender.o +tzfmt.o compactdecimalformat.o gender.o region.o ## Header files to install HEADERS = $(srcdir)/unicode/*.h diff --git a/icu4c/source/i18n/region.cpp b/icu4c/source/i18n/region.cpp index 9e6762def6a..506f852e486 100644 --- a/icu4c/source/i18n/region.cpp +++ b/icu4c/source/i18n/region.cpp @@ -143,7 +143,6 @@ void Region::loadRegionData() { // Process the territory aliases - int32_t territoryAliasSize = ures_getSize(territoryAlias); while ( ures_hasNext(territoryAlias) ) { UResourceBundle *res = ures_getNextResource(territoryAlias,NULL,&status); const char *aliasFrom = ures_getKey(res); diff --git a/icu4c/source/test/intltest/Makefile.in b/icu4c/source/test/intltest/Makefile.in index e02f097ba9b..b8667303b5d 100644 --- a/icu4c/source/test/intltest/Makefile.in +++ b/icu4c/source/test/intltest/Makefile.in @@ -1,6 +1,6 @@ #****************************************************************************** # -# Copyright (C) 1999-2012, International Business Machines +# Copyright (C) 1999-2013, International Business Machines # Corporation and others. All Rights Reserved. # #****************************************************************************** @@ -55,7 +55,7 @@ itrbnf.o itrbnfrt.o itrbnfp.o ucaconf.o icusvtst.o \ uobjtest.o idnaref.o idnaconf.o nptrans.o punyref.o testidn.o testidna.o uts46test.o \ incaltst.o calcasts.o v32test.o uvectest.o textfile.o tokiter.o utxttest.o \ windttst.o winnmtst.o winutil.o csdetest.o tzrulets.o tzoffloc.o tzfmttst.o ssearch.o dtifmtts.o \ -tufmtts.o itspoof.o simplethread.o bidiconf.o locnmtst.o dcfmtest.o alphaindextst.o listformattertest.o genderinfotest.o compactdecimalformattest.o +tufmtts.o itspoof.o simplethread.o bidiconf.o locnmtst.o dcfmtest.o alphaindextst.o listformattertest.o genderinfotest.o compactdecimalformattest.o regiontst.o DEPS = $(OBJECTS:.o=.d) -- 2.40.0