fix building units router branch

diff --git a/icu4c/source/i18n/unitsrouter.h b/icu4c/source/i18n/unitsrouter.h
index a8438e2cdfe0117c4f8a1c0a90c010b0c7d0abb7..3dd1f4d749cca7db111f41e7a2cab9275ce16a90 100644 (file)
--- a/icu4c/source/i18n/unitsrouter.h
+++ b/icu4c/source/i18n/unitsrouter.h
@@ -53,10 +53,10 @@ class U_I18N_API UnitsRouter {
     MaybeStackVector<ConverterPreference> converterPreferences_;
 };
 
-void getUnitsData(const char *outputRegion, const char *usage, const MeasureUnit &inputUnit,
-                  CharString &category, MeasureUnit &baseUnit,
-                  MaybeStackVector<ConversionRateInfo> &conversionInfo,
-                  MaybeStackVector<UnitPreference> &unitPreferences, UErrorCode &status);
+void U_I18N_API getUnitsData(const char *outputRegion, const char *usage, const MeasureUnit &inputUnit,
+                CharString &category, MeasureUnit &baseUnit,
+                MaybeStackVector<ConversionRateInfo> &conversionInfo,
+                MaybeStackVector<UnitPreference> &unitPreferences, UErrorCode &status);
 
 U_NAMESPACE_END
 

diff --git a/icu4c/source/test/intltest/unitsroutertest.cpp b/icu4c/source/test/intltest/unitsroutertest.cpp
index 8e897dc0d122e1c6ea24f275324b1ec2622497a4..8d2489e577ead65959c697aa0b06b3be8f338d02 100644 (file)
--- a/icu4c/source/test/intltest/unitsroutertest.cpp
+++ b/icu4c/source/test/intltest/unitsroutertest.cpp
@@ -7,6 +7,8 @@
 
 #include "intltest.h"
 #include "unicode/unistr.h"
+#include "unitsrouter.h"
+
 
 class UnitsRouterTest : public IntlTest {
   public:

diff --git a/icu4c/source/test/intltest/unitstest.cpp b/icu4c/source/test/intltest/unitstest.cpp
index 5862097379a6346a88d6b74534391cbf8765a3cc..08cde6a73cd15eb8bbbaf72f9f8374a7bc6097d4 100644 (file)
--- a/icu4c/source/test/intltest/unitstest.cpp
+++ b/icu4c/source/test/intltest/unitstest.cpp
@@ -5,6 +5,8 @@
 
 #if !UCONFIG_NO_FORMATTING
 
+#include <iostream>
+
 #include "charstr.h"
 #include "filestrm.h"
 #include "intltest.h"
@@ -16,7 +18,6 @@
 #include "unitconverter.h"
 #include "unitsrouter.h"
 #include "uparse.h"
-#include <iostream>
 
 struct UnitConversionTestCase {
     const StringPiece source;
@@ -54,9 +55,7 @@ class UnitsTest : public IntlTest {
 extern IntlTest *createUnitsTest() { return new UnitsTest(); }
 
 void UnitsTest::runIndexedTest(int32_t index, UBool exec, const char *&name, char * /*par*/) {
-    if (exec) {
-        logln("TestSuite UnitsTest: ");
-    }
+    if (exec) { logln("TestSuite UnitsTest: "); }
     TESTCASE_AUTO_BEGIN;
     TESTCASE_AUTO(testConversions);
     TESTCASE_AUTO(testPreferences);
@@ -811,28 +810,29 @@ void UnitsTest::testGetUnitsData() {
         MaybeStackVector<UnitPreference> unitPreferences;
         getUnitsData(t.outputRegion, t.usage, inputUnit, category, baseUnit, conversionInfo,
                      unitPreferences, status);
-        if (status.errIfFailureAndReset("getUnitsData(\"%s\", \"%s\", \"%s\", ...)", t.outputRegion, t.usage, t.inputUnit)) {
+        if (status.errIfFailureAndReset("getUnitsData(\"%s\", \"%s\", \"%s\", ...)", t.outputRegion,
+                                        t.usage, t.inputUnit)) {
             continue;
         }
         logln("category: \"%s\", baseUnit: \"%s\"", category.data(), baseUnit.getIdentifier());
-        for (int i=0; i < conversionInfo.length(); i++) {
+        for (int i = 0; i < conversionInfo.length(); i++) {
             ConversionRateInfo *cri;
             cri = conversionInfo[i];
             logln("conversionInfo %d: source=\"%s\", target=\"%s\", factor=\"%s\", offset=\"%s\"", i,
                   cri->source.data(), cri->target.data(), cri->factor.data(), cri->offset.data());
         }
-        for (int i=0; i < unitPreferences.length(); i++) {
+        for (int i = 0; i < unitPreferences.length(); i++) {
             UnitPreference *up;
             up = unitPreferences[i];
-            logln("unitPreference %d: \"%s\", geq=%f, skeleton=\"%s\"", i, up->unit.data(),
-                  up->geq, up->skeleton.data());
+            logln("unitPreference %d: \"%s\", geq=%f, skeleton=\"%s\"", i, up->unit.data(), up->geq,
+                  up->skeleton.data());
         }
     }
+}
+
 /**
  * Tests different return statuses depending on the input.
  */
-void UnitsTest::testStatus() {
-
-}
+void UnitsTest::testStatus() {}
 
 #endif /* #if !UCONFIG_NO_FORMATTING */