From 00f73abf0fc8721f31b9683df15b2407dbd5d049 Mon Sep 17 00:00:00 2001 From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com> Date: Tue, 7 Jul 2020 11:12:53 +0200 Subject: [PATCH] Namespace icu::units instead of icu::units::impl. --- icu4c/source/i18n/complexunitsconverter.cpp | 2 -- icu4c/source/i18n/complexunitsconverter.h | 2 -- icu4c/source/i18n/number_usageprefs.h | 5 +++-- icu4c/source/i18n/unitconverter.cpp | 2 -- icu4c/source/i18n/unitconverter.h | 2 -- icu4c/source/i18n/unitsdata.cpp | 2 -- icu4c/source/i18n/unitsdata.h | 2 -- icu4c/source/i18n/unitsrouter.cpp | 2 -- icu4c/source/i18n/unitsrouter.h | 2 -- icu4c/source/test/intltest/unitsdatatest.cpp | 2 +- icu4c/source/test/intltest/unitstest.cpp | 2 +- 11 files changed, 5 insertions(+), 20 deletions(-) diff --git a/icu4c/source/i18n/complexunitsconverter.cpp b/icu4c/source/i18n/complexunitsconverter.cpp index 8d02575dc32..8bbd4de1984 100644 --- a/icu4c/source/i18n/complexunitsconverter.cpp +++ b/icu4c/source/i18n/complexunitsconverter.cpp @@ -16,7 +16,6 @@ U_NAMESPACE_BEGIN namespace units { -namespace impl { ComplexUnitsConverter::ComplexUnitsConverter(const MeasureUnit &inputUnit, const MeasureUnit &outputUnits, @@ -125,7 +124,6 @@ MaybeStackVector ComplexUnitsConverter::convert(double quantity, UError return result; } -} // namespace impl } // namespace units U_NAMESPACE_END diff --git a/icu4c/source/i18n/complexunitsconverter.h b/icu4c/source/i18n/complexunitsconverter.h index 122bb46e4c1..b921d8ab03f 100644 --- a/icu4c/source/i18n/complexunitsconverter.h +++ b/icu4c/source/i18n/complexunitsconverter.h @@ -16,7 +16,6 @@ U_NAMESPACE_BEGIN namespace units { -namespace impl { /** * Converts from single or compound unit to single, compound or mixed units. @@ -62,7 +61,6 @@ class U_I18N_API ComplexUnitsConverter { MaybeStackVector units_; }; -} // namespace impl } // namespace units U_NAMESPACE_END diff --git a/icu4c/source/i18n/number_usageprefs.h b/icu4c/source/i18n/number_usageprefs.h index f0439770536..558ec98dab2 100644 --- a/icu4c/source/i18n/number_usageprefs.h +++ b/icu4c/source/i18n/number_usageprefs.h @@ -9,10 +9,11 @@ #include "number_types.h" #include "unitsrouter.h" -U_NAMESPACE_BEGIN namespace number { +U_NAMESPACE_BEGIN +namespace number { namespace impl { -using ::icu::units::impl::UnitsRouter; +using ::icu::units::UnitsRouter; /** * A MicroPropsGenerator which uses UnitsRouter to produce output converted to a diff --git a/icu4c/source/i18n/unitconverter.cpp b/icu4c/source/i18n/unitconverter.cpp index deba506e0ab..b4c849df9ce 100644 --- a/icu4c/source/i18n/unitconverter.cpp +++ b/icu4c/source/i18n/unitconverter.cpp @@ -17,7 +17,6 @@ U_NAMESPACE_BEGIN namespace units { -namespace impl { namespace { @@ -505,7 +504,6 @@ double UnitConverter::convert(double inputValue) const { return result * 1.000000000001; } -} // namespace impl } // namespace units U_NAMESPACE_END diff --git a/icu4c/source/i18n/unitconverter.h b/icu4c/source/i18n/unitconverter.h index 0a1b7beb878..b54a11942b1 100644 --- a/icu4c/source/i18n/unitconverter.h +++ b/icu4c/source/i18n/unitconverter.h @@ -15,7 +15,6 @@ U_NAMESPACE_BEGIN namespace units { -namespace impl { /** * Represents the conversion rate between `source` and `target`. @@ -91,7 +90,6 @@ class U_I18N_API UnitConverter : public UMemory { ConversionRate conversionRate_; }; -} // namespace impl } // namespace units U_NAMESPACE_END diff --git a/icu4c/source/i18n/unitsdata.cpp b/icu4c/source/i18n/unitsdata.cpp index 01c8d149ff6..2bf71a283a6 100644 --- a/icu4c/source/i18n/unitsdata.cpp +++ b/icu4c/source/i18n/unitsdata.cpp @@ -15,7 +15,6 @@ U_NAMESPACE_BEGIN namespace units { -namespace impl { namespace { @@ -416,7 +415,6 @@ void U_I18N_API UnitPreferences::getPreferencesFor(StringPiece category, StringP preferenceCount = m->prefsCount; } -} // namespace impl } // namespace units U_NAMESPACE_END diff --git a/icu4c/source/i18n/unitsdata.h b/icu4c/source/i18n/unitsdata.h index 6e90e0c4718..a938f711d3f 100644 --- a/icu4c/source/i18n/unitsdata.h +++ b/icu4c/source/i18n/unitsdata.h @@ -14,7 +14,6 @@ U_NAMESPACE_BEGIN namespace units { -namespace impl { /** * Looks up the unit category of a base unit identifier. @@ -192,7 +191,6 @@ class U_I18N_API UnitPreferences { MaybeStackVector unitPrefs_; }; -} // namespace impl } // namespace units U_NAMESPACE_END diff --git a/icu4c/source/i18n/unitsrouter.cpp b/icu4c/source/i18n/unitsrouter.cpp index 1f328a23bb6..5a4b48bd274 100644 --- a/icu4c/source/i18n/unitsrouter.cpp +++ b/icu4c/source/i18n/unitsrouter.cpp @@ -19,7 +19,6 @@ U_NAMESPACE_BEGIN namespace units { -namespace impl { UnitsRouter::UnitsRouter(MeasureUnit inputUnit, StringPiece region, StringPiece usage, UErrorCode &status) { @@ -70,7 +69,6 @@ const MaybeStackVector *UnitsRouter::getOutputUnits() const { return &outputUnits_; } -} // namespace impl } // namespace units U_NAMESPACE_END diff --git a/icu4c/source/i18n/unitsrouter.h b/icu4c/source/i18n/unitsrouter.h index 62bf78c6e31..24757fa7ceb 100644 --- a/icu4c/source/i18n/unitsrouter.h +++ b/icu4c/source/i18n/unitsrouter.h @@ -20,7 +20,6 @@ U_NAMESPACE_BEGIN namespace units { -namespace impl { /** * Contains the complex unit converter and the limit which representing the smallest value that the @@ -95,7 +94,6 @@ class U_I18N_API UnitsRouter { MaybeStackVector converterPreferences_; }; -} // namespace impl } // namespace units U_NAMESPACE_END diff --git a/icu4c/source/test/intltest/unitsdatatest.cpp b/icu4c/source/test/intltest/unitsdatatest.cpp index 2851a0d2cab..b0f9a2ed026 100644 --- a/icu4c/source/test/intltest/unitsdatatest.cpp +++ b/icu4c/source/test/intltest/unitsdatatest.cpp @@ -6,7 +6,7 @@ #include "unitsdata.h" #include "intltest.h" -using namespace ::icu::units::impl; +using namespace ::icu::units; class UnitsDataTest : public IntlTest { public: diff --git a/icu4c/source/test/intltest/unitstest.cpp b/icu4c/source/test/intltest/unitstest.cpp index 313bb052d43..2c35c5ff06d 100644 --- a/icu4c/source/test/intltest/unitstest.cpp +++ b/icu4c/source/test/intltest/unitstest.cpp @@ -31,7 +31,7 @@ struct UnitConversionTestCase { }; using ::icu::number::impl::DecimalQuantity; -using namespace ::icu::units::impl; +using namespace ::icu::units; class UnitsTest : public IntlTest { public: