From: Shane Carr <shane@unicode.org>
Date: Tue, 27 Feb 2018 07:32:38 +0000 (+0000)
Subject: ICU-13574 Merging trunk to branch
X-Git-Tag: release-62-rc~200^2~117
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9759fc597f4c02ef6c4582c3381340a87cb041f9;p=icu

ICU-13574 Merging trunk to branch

X-SVN-Rev: 40993
---

9759fc597f4c02ef6c4582c3381340a87cb041f9
diff --cc icu4c/source/i18n/Makefile.in
index d05b907c368,e52be377e04..6bfbaed62cb
--- a/icu4c/source/i18n/Makefile.in
+++ b/icu4c/source/i18n/Makefile.in
@@@ -108,9 -108,8 +108,11 @@@ number_decimfmtprops.o number_fluent.o 
  number_integerwidth.o number_longnames.o number_modifiers.o number_notation.o \
  number_padding.o number_patternmodifier.o number_patternstring.o \
  number_rounding.o number_scientific.o number_stringbuilder.o \
+ double-conversion.o double-conversion-bignum-dtoa.o double-conversion-bignum.o \
 -double-conversion-cached-powers.o double-conversion-diy-fp.o double-conversion-fast-dtoa.o
++double-conversion-cached-powers.o double-conversion-diy-fp.o double-conversion-fast-dtoa.o \
 +numparse_stringsegment.o numparse_unisets.o numparse_parsednumber.o \
 +numparse_impl.o numparse_symbols.o numparse_decimal.o numparse_scientific.o \
 +numparse_currency.o numparse_affixes.o numparse_compositions.o
  
  
  ## Header files to install
diff --cc icu4c/source/test/intltest/Makefile.in
index c67f0006cae,e8a5b72b22d..abdb68d7559
--- a/icu4c/source/test/intltest/Makefile.in
+++ b/icu4c/source/test/intltest/Makefile.in
@@@ -64,8 -64,7 +64,8 @@@ scientificnumberformattertest.o datadri
  numberformattesttuple.o numberformat2test.o pluralmaptest.o \
  numbertest_affixutils.o numbertest_api.o numbertest_decimalquantity.o \
  numbertest_modifiers.o numbertest_patternmodifier.o numbertest_patternstring.o \
 -numbertest_stringbuilder.o numbertest_doubleconversion.o
 +numbertest_stringbuilder.o numbertest_stringsegment.o numbertest_unisets.o \
- numbertest_parse.o
++numbertest_parse.o numbertest_doubleconversion.o
  
  DEPS = $(OBJECTS:.o=.d)
  
diff --cc icu4c/source/test/intltest/numbertest.h
index 5d56dab2066,c1d5044761b..9ee15f4ece4
--- a/icu4c/source/test/intltest/numbertest.h
+++ b/icu4c/source/test/intltest/numbertest.h
@@@ -247,9 -215,7 +255,10 @@@ class NumberTest : public IntlTest 
          TESTCLASS(4, PatternModifierTest);
          TESTCLASS(5, PatternStringTest);
          TESTCLASS(6, NumberStringBuilderTest);
-         TESTCLASS(7, StringSegmentTest);
-         TESTCLASS(8, UniSetsTest);
-         TESTCLASS(9, NumberParserTest);
+         TESTCLASS(7, DoubleConversionTest);
++        TESTCLASS(8, StringSegmentTest);
++        TESTCLASS(9, UniSetsTest);
++        TESTCLASS(10, NumberParserTest);
          default: name = ""; break; // needed to end loop
          }
      }