From e8042785681f955f812a284b0a2f5e875ae9b26d Mon Sep 17 00:00:00 2001 From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com> Date: Tue, 7 Jul 2020 17:11:34 +0200 Subject: [PATCH 1/4] Signum, not SigNum. --- icu4c/source/i18n/unitconverter.cpp | 40 ++++++++++++++--------------- icu4c/source/i18n/unitconverter.h | 6 ++--- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/icu4c/source/i18n/unitconverter.cpp b/icu4c/source/i18n/unitconverter.cpp index a0f2efce385..6ff438a67ff 100644 --- a/icu4c/source/i18n/unitconverter.cpp +++ b/icu4c/source/i18n/unitconverter.cpp @@ -100,10 +100,10 @@ void Factor::substituteConstants() { } auto absPower = std::abs(this->constants[i]); - SigNum powerSig = this->constants[i] < 0 ? SigNum::NEGATIVE : SigNum::POSITIVE; + Signum powerSig = this->constants[i] < 0 ? Signum::NEGATIVE : Signum::POSITIVE; double absConstantValue = std::pow(constantsValues[i], absPower); - if (powerSig == SigNum::NEGATIVE) { + if (powerSig == Signum::NEGATIVE) { this->factorDen *= absConstantValue; } else { this->factorNum *= absConstantValue; @@ -157,7 +157,7 @@ double strHasDivideSignToDouble(StringPiece strWithDivide, UErrorCode &status) { Adds single factor to a `Factor` object. Single factor means "23^2", "23.3333", "ft2m^3" ...etc. However, complex factor are not included, such as "ft2m^3*200/3" */ -void addFactorElement(Factor &factor, StringPiece elementStr, SigNum sigNum, UErrorCode &status) { +void addFactorElement(Factor &factor, StringPiece elementStr, Signum signum, UErrorCode &status) { StringPiece baseStr; StringPiece powerStr; int32_t power = @@ -182,7 +182,7 @@ void addFactorElement(Factor &factor, StringPiece elementStr, SigNum sigNum, UEr baseStr = elementStr; } - addSingleFactorConstant(baseStr, power, sigNum, factor, status); + addSingleFactorConstant(baseStr, power, signum, factor, status); } /* @@ -190,21 +190,21 @@ void addFactorElement(Factor &factor, StringPiece elementStr, SigNum sigNum, UEr */ Factor extractFactorConversions(StringPiece stringFactor, UErrorCode &status) { Factor result; - SigNum sigNum = SigNum::POSITIVE; + Signum signum = Signum::POSITIVE; auto factorData = stringFactor.data(); for (int32_t i = 0, start = 0, n = stringFactor.length(); i < n; i++) { if (factorData[i] == '*' || factorData[i] == '/') { StringPiece factorElement = stringFactor.substr(start, i - start); - addFactorElement(result, factorElement, sigNum, status); + addFactorElement(result, factorElement, signum, status); start = i + 1; // Set `start` to point to the start of the new element. } else if (i == n - 1) { // Last element - addFactorElement(result, stringFactor.substr(start, i + 1), sigNum, status); + addFactorElement(result, stringFactor.substr(start, i + 1), signum, status); } if (factorData[i] == '/') { - sigNum = SigNum::NEGATIVE; // Change the sigNum because we reached the Denominator. + signum = Signum::NEGATIVE; // Change the signum because we reached the Denominator. } } @@ -318,34 +318,34 @@ void loadConversionRate(ConversionRate &conversionRate, const MeasureUnit &sourc } // namespace -void U_I18N_API addSingleFactorConstant(StringPiece baseStr, int32_t power, SigNum sigNum, +void U_I18N_API addSingleFactorConstant(StringPiece baseStr, int32_t power, Signum signum, Factor &factor, UErrorCode &status) { if (baseStr == "ft_to_m") { - factor.constants[CONSTANT_FT2M] += power * sigNum; + factor.constants[CONSTANT_FT2M] += power * signum; } else if (baseStr == "ft2_to_m2") { - factor.constants[CONSTANT_FT2M] += 2 * power * sigNum; + factor.constants[CONSTANT_FT2M] += 2 * power * signum; } else if (baseStr == "ft3_to_m3") { - factor.constants[CONSTANT_FT2M] += 3 * power * sigNum; + factor.constants[CONSTANT_FT2M] += 3 * power * signum; } else if (baseStr == "in3_to_m3") { - factor.constants[CONSTANT_FT2M] += 3 * power * sigNum; + factor.constants[CONSTANT_FT2M] += 3 * power * signum; factor.factorDen *= 12 * 12 * 12; } else if (baseStr == "gal_to_m3") { factor.factorNum *= 231; - factor.constants[CONSTANT_FT2M] += 3 * power * sigNum; + factor.constants[CONSTANT_FT2M] += 3 * power * signum; factor.factorDen *= 12 * 12 * 12; } else if (baseStr == "gal_imp_to_m3") { - factor.constants[CONSTANT_GAL_IMP2M3] += power * sigNum; + factor.constants[CONSTANT_GAL_IMP2M3] += power * signum; } else if (baseStr == "G") { - factor.constants[CONSTANT_G] += power * sigNum; + factor.constants[CONSTANT_G] += power * signum; } else if (baseStr == "gravity") { - factor.constants[CONSTANT_GRAVITY] += power * sigNum; + factor.constants[CONSTANT_GRAVITY] += power * signum; } else if (baseStr == "lb_to_kg") { - factor.constants[CONSTANT_LB2KG] += power * sigNum; + factor.constants[CONSTANT_LB2KG] += power * signum; } else if (baseStr == "PI") { - factor.constants[CONSTANT_PI] += power * sigNum; + factor.constants[CONSTANT_PI] += power * signum; } else { - if (sigNum == SigNum::NEGATIVE) { + if (signum == Signum::NEGATIVE) { factor.factorDen *= std::pow(strToDouble(baseStr, status), power); } else { factor.factorNum *= std::pow(strToDouble(baseStr, status), power); diff --git a/icu4c/source/i18n/unitconverter.h b/icu4c/source/i18n/unitconverter.h index cc85d924132..4a5c4d1d4cf 100644 --- a/icu4c/source/i18n/unitconverter.h +++ b/icu4c/source/i18n/unitconverter.h @@ -30,10 +30,10 @@ enum Constants { CONSTANTS_COUNT }; -typedef enum SigNum { +typedef enum Signum { NEGATIVE = -1, POSITIVE = 1, -} SigNum; +} Signum; /* Represents a conversion factor */ struct Factor { @@ -60,7 +60,7 @@ struct Factor { /* * Adds a single factor element to the `Factor`. e.g "ft3m", "2.333" or "cup2m3". But not "cup2m3^3". */ -void U_I18N_API addSingleFactorConstant(StringPiece baseStr, int32_t power, SigNum sigNum, +void U_I18N_API addSingleFactorConstant(StringPiece baseStr, int32_t power, Signum sigNum, Factor &factor, UErrorCode &status); /** From 23e07f3a0ef41750b7cb60baae702a615e4b8b33 Mon Sep 17 00:00:00 2001 From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com> Date: Fri, 10 Jul 2020 20:22:50 +0200 Subject: [PATCH 2/4] Follow IWYU recommendations with only a couple of exceptions: Exceptions: - uconfig.h, umachine.h, uversion.h (included via utypes.h) - urename.h, stddef.h (included via umachine.h, thus utypes.h) - a couple of forward declarations, where transitive includes take care of it (number_usageprefs.h: DecimalQuantity, MicroProps). --- icu4c/source/i18n/complexunitsconverter.cpp | 4 +++- icu4c/source/i18n/complexunitsconverter.h | 6 ++++-- icu4c/source/i18n/number_usageprefs.cpp | 9 +++++++++ icu4c/source/i18n/number_usageprefs.h | 6 ++++++ icu4c/source/i18n/unitconverter.cpp | 13 +++++++++---- icu4c/source/i18n/unitconverter.h | 6 +++--- icu4c/source/i18n/unitsdata.cpp | 5 ++++- icu4c/source/i18n/unitsdata.h | 3 ++- icu4c/source/i18n/unitsrouter.cpp | 10 +++------- icu4c/source/i18n/unitsrouter.h | 8 +++++--- 10 files changed, 48 insertions(+), 22 deletions(-) diff --git a/icu4c/source/i18n/complexunitsconverter.cpp b/icu4c/source/i18n/complexunitsconverter.cpp index 8bbd4de1984..45eee87e9dd 100644 --- a/icu4c/source/i18n/complexunitsconverter.cpp +++ b/icu4c/source/i18n/complexunitsconverter.cpp @@ -6,13 +6,15 @@ #if !UCONFIG_NO_FORMATTING #include -#include #include "cmemory.h" #include "complexunitsconverter.h" #include "uassert.h" #include "unicode/fmtable.h" +#include "unicode/localpointer.h" // for LocalArray +#include "unicode/measure.h" // for Measure #include "unitconverter.h" +#include // for int32_t, int64_t U_NAMESPACE_BEGIN namespace units { diff --git a/icu4c/source/i18n/complexunitsconverter.h b/icu4c/source/i18n/complexunitsconverter.h index b921d8ab03f..fbae2b1b6e3 100644 --- a/icu4c/source/i18n/complexunitsconverter.h +++ b/icu4c/source/i18n/complexunitsconverter.h @@ -8,13 +8,15 @@ #define __COMPLEXUNITSCONVERTER_H__ #include "cmemory.h" -#include "unicode/errorcode.h" #include "unicode/measunit.h" -#include "unicode/measure.h" #include "unitconverter.h" #include "unitsdata.h" U_NAMESPACE_BEGIN + +// Forward declarations +class Measure; + namespace units { /** diff --git a/icu4c/source/i18n/number_usageprefs.cpp b/icu4c/source/i18n/number_usageprefs.cpp index 588d99bed43..eefba9a76c5 100644 --- a/icu4c/source/i18n/number_usageprefs.cpp +++ b/icu4c/source/i18n/number_usageprefs.cpp @@ -4,9 +4,18 @@ #if !UCONFIG_NO_FORMATTING #include "number_usageprefs.h" +#include "cstring.h" // for uprv_strncpy #include "number_decimalquantity.h" #include "number_microprops.h" +#include "number_roundingutils.h" // for RoundingImpl +#include "unicode/char16ptr.h" // for ConstChar16Ptr +#include "unicode/currunit.h" // for CurrencyUnit +#include "unicode/fmtable.h" // for Formattable, impl, number +#include "unicode/measure.h" // for Measure #include "unicode/numberformatter.h" +#include "unicode/platform.h" // for U_NOEXCEPT +#include "unicode/unum.h" // for UNumberFormatRoundingMode +#include "unicode/urename.h" // for uprv_free, uprv_malloc using namespace icu::number; using namespace icu::number::impl; diff --git a/icu4c/source/i18n/number_usageprefs.h b/icu4c/source/i18n/number_usageprefs.h index 558ec98dab2..3afb4d730e2 100644 --- a/icu4c/source/i18n/number_usageprefs.h +++ b/icu4c/source/i18n/number_usageprefs.h @@ -1,12 +1,18 @@ // © 2020 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html +#include "unicode/utypes.h" // for UErrorCode, U_I18N_API + #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_USAGEPREFS_H__ #define __NUMBER_USAGEPREFS_H__ #include "cmemory.h" #include "number_types.h" +#include "unicode/locid.h" // for Locale +#include "unicode/measunit.h" // for MeasureUnit +#include "unicode/stringpiece.h" // for StringPiece +#include "unicode/uobject.h" // for UMemory #include "unitsrouter.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/i18n/unitconverter.cpp b/icu4c/source/i18n/unitconverter.cpp index 6ff438a67ff..0f46ec7e5c7 100644 --- a/icu4c/source/i18n/unitconverter.cpp +++ b/icu4c/source/i18n/unitconverter.cpp @@ -5,15 +5,20 @@ #if !UCONFIG_NO_FORMATTING -#include - #include "charstr.h" -#include "double-conversion.h" +#include "cmemory.h" // for MaybeStackVector +#include "double-conversion-string-to-double.h" // for StringToDoubleConverter #include "measunit_impl.h" -#include "unicode/errorcode.h" +#include "uassert.h" // for U_ASSERT +#include "unicode/localpointer.h" // for LocalArray #include "unicode/measunit.h" #include "unicode/stringpiece.h" #include "unitconverter.h" +#include // for max +#include +#include // for int32_t, int8_t +#include // for abs +#include // for swap U_NAMESPACE_BEGIN namespace units { diff --git a/icu4c/source/i18n/unitconverter.h b/icu4c/source/i18n/unitconverter.h index 4a5c4d1d4cf..b30fe913972 100644 --- a/icu4c/source/i18n/unitconverter.h +++ b/icu4c/source/i18n/unitconverter.h @@ -7,11 +7,11 @@ #ifndef __UNITCONVERTER_H__ #define __UNITCONVERTER_H__ -#include "cmemory.h" -#include "unicode/errorcode.h" #include "unicode/measunit.h" -#include "unitconverter.h" +#include "unicode/stringpiece.h" // for StringPiece +#include "unicode/uobject.h" // for UMemory #include "unitsdata.h" +#include // for int32_t U_NAMESPACE_BEGIN namespace units { diff --git a/icu4c/source/i18n/unitsdata.cpp b/icu4c/source/i18n/unitsdata.cpp index 2bf71a283a6..3ecf8a31893 100644 --- a/icu4c/source/i18n/unitsdata.cpp +++ b/icu4c/source/i18n/unitsdata.cpp @@ -5,13 +5,16 @@ #if !UCONFIG_NO_FORMATTING -#include "number_decimalquantity.h" #include "cstring.h" #include "number_decimalquantity.h" #include "resource.h" +#include "uassert.h" // for U_ASSERT +#include "unicode/unistr.h" // for UnicodeString +#include "unicode/ures.h" // for LocalUResourceBundlePointer, ure... #include "unitsdata.h" #include "uresimp.h" #include "util.h" +#include // for move U_NAMESPACE_BEGIN namespace units { diff --git a/icu4c/source/i18n/unitsdata.h b/icu4c/source/i18n/unitsdata.h index a938f711d3f..1169784e5fe 100644 --- a/icu4c/source/i18n/unitsdata.h +++ b/icu4c/source/i18n/unitsdata.h @@ -9,8 +9,9 @@ #include "charstr.h" #include "cmemory.h" -#include "unicode/measunit.h" #include "unicode/stringpiece.h" +#include "unicode/uobject.h" // for UMemory +#include // for int32_t U_NAMESPACE_BEGIN namespace units { diff --git a/icu4c/source/i18n/unitsrouter.cpp b/icu4c/source/i18n/unitsrouter.cpp index 5a4b48bd274..08d177e9409 100644 --- a/icu4c/source/i18n/unitsrouter.cpp +++ b/icu4c/source/i18n/unitsrouter.cpp @@ -5,17 +5,13 @@ #if !UCONFIG_NO_FORMATTING -#include -#include - +#include "charstr.h" // for CharString #include "cmemory.h" -#include "cstring.h" -#include "number_decimalquantity.h" -#include "resource.h" +#include "unicode/measure.h" // for Measure #include "unitconverter.h" // for extractCompoundBaseUnit #include "unitsdata.h" // for getUnitCategory #include "unitsrouter.h" -#include "uresimp.h" +#include // for int32_t U_NAMESPACE_BEGIN namespace units { diff --git a/icu4c/source/i18n/unitsrouter.h b/icu4c/source/i18n/unitsrouter.h index 24757fa7ceb..cbdb7b893eb 100644 --- a/icu4c/source/i18n/unitsrouter.h +++ b/icu4c/source/i18n/unitsrouter.h @@ -9,16 +9,18 @@ #include -#include "charstr.h" // CharString #include "cmemory.h" #include "complexunitsconverter.h" -#include "unicode/errorcode.h" #include "unicode/measunit.h" -#include "unicode/measure.h" #include "unicode/stringpiece.h" +#include "unicode/uobject.h" // for UMemory #include "unitsdata.h" U_NAMESPACE_BEGIN + +// Forward declarations +class Measure; + namespace units { /** From 94ddf7c14bc6dd8ee13689eb3744084f7bf83377 Mon Sep 17 00:00:00 2001 From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com> Date: Wed, 15 Jul 2020 13:12:34 +0200 Subject: [PATCH 3/4] Remove stdint.h and cstdint includes. --- icu4c/source/i18n/complexunitsconverter.cpp | 1 - icu4c/source/i18n/unitconverter.cpp | 1 - icu4c/source/i18n/unitconverter.h | 1 - icu4c/source/i18n/unitsdata.h | 1 - icu4c/source/i18n/unitsrouter.cpp | 1 - 5 files changed, 5 deletions(-) diff --git a/icu4c/source/i18n/complexunitsconverter.cpp b/icu4c/source/i18n/complexunitsconverter.cpp index 45eee87e9dd..8dd9d62ab7f 100644 --- a/icu4c/source/i18n/complexunitsconverter.cpp +++ b/icu4c/source/i18n/complexunitsconverter.cpp @@ -14,7 +14,6 @@ #include "unicode/localpointer.h" // for LocalArray #include "unicode/measure.h" // for Measure #include "unitconverter.h" -#include // for int32_t, int64_t U_NAMESPACE_BEGIN namespace units { diff --git a/icu4c/source/i18n/unitconverter.cpp b/icu4c/source/i18n/unitconverter.cpp index 0f46ec7e5c7..eccbd6064cc 100644 --- a/icu4c/source/i18n/unitconverter.cpp +++ b/icu4c/source/i18n/unitconverter.cpp @@ -16,7 +16,6 @@ #include "unitconverter.h" #include // for max #include -#include // for int32_t, int8_t #include // for abs #include // for swap diff --git a/icu4c/source/i18n/unitconverter.h b/icu4c/source/i18n/unitconverter.h index b30fe913972..7920d4857d4 100644 --- a/icu4c/source/i18n/unitconverter.h +++ b/icu4c/source/i18n/unitconverter.h @@ -11,7 +11,6 @@ #include "unicode/stringpiece.h" // for StringPiece #include "unicode/uobject.h" // for UMemory #include "unitsdata.h" -#include // for int32_t U_NAMESPACE_BEGIN namespace units { diff --git a/icu4c/source/i18n/unitsdata.h b/icu4c/source/i18n/unitsdata.h index 1169784e5fe..9988d6f4abc 100644 --- a/icu4c/source/i18n/unitsdata.h +++ b/icu4c/source/i18n/unitsdata.h @@ -11,7 +11,6 @@ #include "cmemory.h" #include "unicode/stringpiece.h" #include "unicode/uobject.h" // for UMemory -#include // for int32_t U_NAMESPACE_BEGIN namespace units { diff --git a/icu4c/source/i18n/unitsrouter.cpp b/icu4c/source/i18n/unitsrouter.cpp index 08d177e9409..5c8efb246bc 100644 --- a/icu4c/source/i18n/unitsrouter.cpp +++ b/icu4c/source/i18n/unitsrouter.cpp @@ -11,7 +11,6 @@ #include "unitconverter.h" // for extractCompoundBaseUnit #include "unitsdata.h" // for getUnitCategory #include "unitsrouter.h" -#include // for int32_t U_NAMESPACE_BEGIN namespace units { From 96774f5339ccf4b008599400601cb398c81dede4 Mon Sep 17 00:00:00 2001 From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com> Date: Wed, 15 Jul 2020 13:21:03 +0200 Subject: [PATCH 4/4] Remove IWYU 'Why Comments'. --- icu4c/source/i18n/complexunitsconverter.cpp | 4 ++-- icu4c/source/i18n/number_usageprefs.cpp | 18 +++++++++--------- icu4c/source/i18n/number_usageprefs.h | 10 +++++----- icu4c/source/i18n/unitconverter.cpp | 14 +++++++------- icu4c/source/i18n/unitconverter.h | 4 ++-- icu4c/source/i18n/unitsdata.cpp | 8 ++++---- icu4c/source/i18n/unitsdata.h | 2 +- icu4c/source/i18n/unitsrouter.cpp | 8 ++++---- icu4c/source/i18n/unitsrouter.h | 2 +- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/icu4c/source/i18n/complexunitsconverter.cpp b/icu4c/source/i18n/complexunitsconverter.cpp index 8dd9d62ab7f..4890f748c33 100644 --- a/icu4c/source/i18n/complexunitsconverter.cpp +++ b/icu4c/source/i18n/complexunitsconverter.cpp @@ -11,8 +11,8 @@ #include "complexunitsconverter.h" #include "uassert.h" #include "unicode/fmtable.h" -#include "unicode/localpointer.h" // for LocalArray -#include "unicode/measure.h" // for Measure +#include "unicode/localpointer.h" +#include "unicode/measure.h" #include "unitconverter.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/i18n/number_usageprefs.cpp b/icu4c/source/i18n/number_usageprefs.cpp index eefba9a76c5..e42714af55f 100644 --- a/icu4c/source/i18n/number_usageprefs.cpp +++ b/icu4c/source/i18n/number_usageprefs.cpp @@ -4,18 +4,18 @@ #if !UCONFIG_NO_FORMATTING #include "number_usageprefs.h" -#include "cstring.h" // for uprv_strncpy +#include "cstring.h" #include "number_decimalquantity.h" #include "number_microprops.h" -#include "number_roundingutils.h" // for RoundingImpl -#include "unicode/char16ptr.h" // for ConstChar16Ptr -#include "unicode/currunit.h" // for CurrencyUnit -#include "unicode/fmtable.h" // for Formattable, impl, number -#include "unicode/measure.h" // for Measure +#include "number_roundingutils.h" +#include "unicode/char16ptr.h" +#include "unicode/currunit.h" +#include "unicode/fmtable.h" +#include "unicode/measure.h" #include "unicode/numberformatter.h" -#include "unicode/platform.h" // for U_NOEXCEPT -#include "unicode/unum.h" // for UNumberFormatRoundingMode -#include "unicode/urename.h" // for uprv_free, uprv_malloc +#include "unicode/platform.h" +#include "unicode/unum.h" +#include "unicode/urename.h" using namespace icu::number; using namespace icu::number::impl; diff --git a/icu4c/source/i18n/number_usageprefs.h b/icu4c/source/i18n/number_usageprefs.h index 3afb4d730e2..fa56c1ea5c7 100644 --- a/icu4c/source/i18n/number_usageprefs.h +++ b/icu4c/source/i18n/number_usageprefs.h @@ -1,7 +1,7 @@ // © 2020 and later: Unicode, Inc. and others. // License & terms of use: http://www.unicode.org/copyright.html -#include "unicode/utypes.h" // for UErrorCode, U_I18N_API +#include "unicode/utypes.h" #if !UCONFIG_NO_FORMATTING #ifndef __NUMBER_USAGEPREFS_H__ @@ -9,10 +9,10 @@ #include "cmemory.h" #include "number_types.h" -#include "unicode/locid.h" // for Locale -#include "unicode/measunit.h" // for MeasureUnit -#include "unicode/stringpiece.h" // for StringPiece -#include "unicode/uobject.h" // for UMemory +#include "unicode/locid.h" +#include "unicode/measunit.h" +#include "unicode/stringpiece.h" +#include "unicode/uobject.h" #include "unitsrouter.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/i18n/unitconverter.cpp b/icu4c/source/i18n/unitconverter.cpp index eccbd6064cc..e03e7c61745 100644 --- a/icu4c/source/i18n/unitconverter.cpp +++ b/icu4c/source/i18n/unitconverter.cpp @@ -6,18 +6,18 @@ #if !UCONFIG_NO_FORMATTING #include "charstr.h" -#include "cmemory.h" // for MaybeStackVector -#include "double-conversion-string-to-double.h" // for StringToDoubleConverter +#include "cmemory.h" +#include "double-conversion-string-to-double.h" #include "measunit_impl.h" -#include "uassert.h" // for U_ASSERT -#include "unicode/localpointer.h" // for LocalArray +#include "uassert.h" +#include "unicode/localpointer.h" #include "unicode/measunit.h" #include "unicode/stringpiece.h" #include "unitconverter.h" -#include // for max +#include #include -#include // for abs -#include // for swap +#include +#include U_NAMESPACE_BEGIN namespace units { diff --git a/icu4c/source/i18n/unitconverter.h b/icu4c/source/i18n/unitconverter.h index 7920d4857d4..92a7e6ee007 100644 --- a/icu4c/source/i18n/unitconverter.h +++ b/icu4c/source/i18n/unitconverter.h @@ -8,8 +8,8 @@ #define __UNITCONVERTER_H__ #include "unicode/measunit.h" -#include "unicode/stringpiece.h" // for StringPiece -#include "unicode/uobject.h" // for UMemory +#include "unicode/stringpiece.h" +#include "unicode/uobject.h" #include "unitsdata.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/i18n/unitsdata.cpp b/icu4c/source/i18n/unitsdata.cpp index 3ecf8a31893..67116c66a53 100644 --- a/icu4c/source/i18n/unitsdata.cpp +++ b/icu4c/source/i18n/unitsdata.cpp @@ -8,13 +8,13 @@ #include "cstring.h" #include "number_decimalquantity.h" #include "resource.h" -#include "uassert.h" // for U_ASSERT -#include "unicode/unistr.h" // for UnicodeString -#include "unicode/ures.h" // for LocalUResourceBundlePointer, ure... +#include "uassert.h" +#include "unicode/unistr.h" +#include "unicode/ures.h" #include "unitsdata.h" #include "uresimp.h" #include "util.h" -#include // for move +#include U_NAMESPACE_BEGIN namespace units { diff --git a/icu4c/source/i18n/unitsdata.h b/icu4c/source/i18n/unitsdata.h index 9988d6f4abc..c6503cb96aa 100644 --- a/icu4c/source/i18n/unitsdata.h +++ b/icu4c/source/i18n/unitsdata.h @@ -10,7 +10,7 @@ #include "charstr.h" #include "cmemory.h" #include "unicode/stringpiece.h" -#include "unicode/uobject.h" // for UMemory +#include "unicode/uobject.h" U_NAMESPACE_BEGIN namespace units { diff --git a/icu4c/source/i18n/unitsrouter.cpp b/icu4c/source/i18n/unitsrouter.cpp index 5c8efb246bc..5ca7b62e038 100644 --- a/icu4c/source/i18n/unitsrouter.cpp +++ b/icu4c/source/i18n/unitsrouter.cpp @@ -5,11 +5,11 @@ #if !UCONFIG_NO_FORMATTING -#include "charstr.h" // for CharString +#include "charstr.h" #include "cmemory.h" -#include "unicode/measure.h" // for Measure -#include "unitconverter.h" // for extractCompoundBaseUnit -#include "unitsdata.h" // for getUnitCategory +#include "unicode/measure.h" +#include "unitconverter.h" +#include "unitsdata.h" #include "unitsrouter.h" U_NAMESPACE_BEGIN diff --git a/icu4c/source/i18n/unitsrouter.h b/icu4c/source/i18n/unitsrouter.h index cbdb7b893eb..c8b8a646f61 100644 --- a/icu4c/source/i18n/unitsrouter.h +++ b/icu4c/source/i18n/unitsrouter.h @@ -13,7 +13,7 @@ #include "complexunitsconverter.h" #include "unicode/measunit.h" #include "unicode/stringpiece.h" -#include "unicode/uobject.h" // for UMemory +#include "unicode/uobject.h" #include "unitsdata.h" U_NAMESPACE_BEGIN