Namespace icu::units instead of icu::units::impl.

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<Measure> ComplexUnitsConverter::convert(double quantity, UError
     return result;
 }
 
-} // namespace impl
 } // namespace units
 U_NAMESPACE_END
 

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<MeasureUnit> units_;
 };
 
-} // namespace impl
 } // namespace units
 U_NAMESPACE_END
 

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

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
 

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
 

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
 

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<UnitPreference> unitPrefs_;
 };
 
-} // namespace impl
 } // namespace units
 U_NAMESPACE_END
 

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<MeasureUnit> *UnitsRouter::getOutputUnits() const {
     return &outputUnits_;
 }
 
-} // namespace impl
 } // namespace units
 U_NAMESPACE_END
 

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<ConverterPreference> converterPreferences_;
 };
 
-} // namespace impl
 } // namespace units
 U_NAMESPACE_END
 

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:

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: