ICU-13412 Merging the fix for #13411 number_rounding.cpp compile error with MSVC (r40630 + r40635 + r40636) to maint-60.

X-SVN-Rev: 40639

icu4c/source/i18n/number_affixutils.cpp

@@ -8,8 +8,9 @@
 #include "number_affixutils.h"
 #include "unicode/utf16.h"
 
-using namespace icu::number::impl;
 using namespace icu;
+using namespace icu::number;
+using namespace icu::number::impl;
 
 int32_t AffixUtils::estimateLength(const CharSequence &patternString, UErrorCode &status) {
     AffixPatternState state = STATE_BASE;

icu4c/source/i18n/number_compact.cpp

@@ -13,8 +13,9 @@
 #include "charstr.h"
 #include "uresimp.h"
 
-using namespace icu::number::impl;
 using namespace icu;
+using namespace icu::number;
+using namespace icu::number::impl;
 
 namespace {
 

icu4c/source/i18n/number_decimalquantity.cpp

@@ -16,8 +16,9 @@
 #include "number_roundingutils.h"
 #include "unicode/plurrule.h"
 
-using namespace icu::number::impl;
 using namespace icu;
+using namespace icu::number;
+using namespace icu::number::impl;
 
 namespace {
 

icu4c/source/i18n/number_decimfmtprops.cpp

@@ -7,6 +7,8 @@
 
 #include "number_decimfmtprops.h"
 
+using namespace icu;
+using namespace icu::number;
 using namespace icu::number::impl;
 
 DecimalFormatProperties::DecimalFormatProperties() {

icu4c/source/i18n/number_decimfmtprops.h

@@ -16,8 +16,6 @@
 #include "number_types.h"
 
 U_NAMESPACE_BEGIN
-namespace number {
-namespace impl {
 
 // Export an explicit template instantiation of the LocalPointer that is used as a
 // data member of CurrencyPluralInfoWrapper.
@@ -29,6 +27,9 @@ template class U_I18N_API LocalPointerBase<CurrencyPluralInfo>;
 template class U_I18N_API LocalPointer<CurrencyPluralInfo>;
 #endif
 
+namespace number {
+namespace impl {
+
 // TODO: Figure out a nicer way to deal with CurrencyPluralInfo.
 // Exported as U_I18N_API because it is a public member field of exported DecimalFormatProperties
 struct U_I18N_API CurrencyPluralInfoWrapper {

icu4c/source/i18n/number_formatimpl.cpp

@@ -19,6 +19,7 @@
 #include "number_compact.h"
 
 using namespace icu;
+using namespace icu::number;
 using namespace icu::number::impl;
 
 namespace {

icu4c/source/i18n/number_grouping.cpp

@@ -8,7 +8,9 @@
 #include "unicode/numberformatter.h"
 #include "number_patternstring.h"
 
+using namespace icu;
 using namespace icu::number;
+using namespace icu::number::impl;
 
 Grouper Grouper::defaults() {
     return {-2, -2, false};

icu4c/source/i18n/number_integerwidth.cpp

@@ -9,6 +9,7 @@
 #include "number_types.h"
 #include "number_decimalquantity.h"
 
+using namespace icu;
 using namespace icu::number;
 using namespace icu::number::impl;
 

icu4c/source/i18n/number_longnames.cpp

@@ -14,6 +14,7 @@
 #include "cstring.h"
 
 using namespace icu;
+using namespace icu::number;
 using namespace icu::number::impl;
 
 namespace {

icu4c/source/i18n/number_modifiers.cpp

@@ -11,6 +11,7 @@
 #include "number_modifiers.h"
 
 using namespace icu;
+using namespace icu::number;
 using namespace icu::number::impl;
 
 namespace {

icu4c/source/i18n/number_notation.cpp

@@ -8,6 +8,7 @@
 #include "unicode/numberformatter.h"
 #include "number_types.h"
 
+using namespace icu;
 using namespace icu::number;
 using namespace icu::number::impl;
 

icu4c/source/i18n/number_padding.cpp

@@ -9,6 +9,8 @@
 #include "number_types.h"
 #include "number_stringbuilder.h"
 
+using namespace icu;
+using namespace icu::number;
 using namespace icu::number::impl;
 
 namespace {

icu4c/source/i18n/number_patternmodifier.cpp

@@ -12,6 +12,7 @@
 #include "unicode/unistr.h"
 
 using namespace icu;
+using namespace icu::number;
 using namespace icu::number::impl;
 
 MutablePatternModifier::MutablePatternModifier(bool isStrong) : fStrong(isStrong) {}

icu4c/source/i18n/number_patternmodifier.h

@@ -15,11 +15,6 @@
 #include "number_utils.h"
 
 U_NAMESPACE_BEGIN
-namespace number {
-namespace impl {
-
-// Forward declaration
-class MutablePatternModifier;
 
 // Export an explicit template instantiation of the LocalPointer that is used as a
 // data member of ParameterizedModifier.
@@ -27,10 +22,16 @@ class MutablePatternModifier;
 #if defined (_MSC_VER)
 // Ignore warning 4661 as LocalPointerBase does not use operator== or operator!=
 #pragma warning(suppress: 4661)
-template class U_I18N_API LocalPointerBase<ParameterizedModifier>;
-template class U_I18N_API LocalPointer<ParameterizedModifier>;
+template class U_I18N_API LocalPointerBase<number::impl::ParameterizedModifier>;
+template class U_I18N_API LocalPointer<number::impl::ParameterizedModifier>;
 #endif
 
+namespace number {
+namespace impl {
+
+// Forward declaration
+class MutablePatternModifier;
+
 // Exported as U_I18N_API because it is needed for the unit test PatternModifierTest
 class U_I18N_API ImmutablePatternModifier : public MicroPropsGenerator, public UMemory {
   public:

icu4c/source/i18n/number_patternstring.cpp

@@ -11,6 +11,7 @@
 #include "number_utils.h"
 
 using namespace icu;
+using namespace icu::number;
 using namespace icu::number::impl;
 
 void PatternParser::parseToPatternInfo(const UnicodeString& patternString, ParsedPatternInfo& patternInfo, UErrorCode &status) {

icu4c/source/i18n/number_rounding.cpp

@@ -10,6 +10,7 @@
 #include "number_types.h"
 #include "number_decimalquantity.h"
 
+using namespace icu;
 using namespace icu::number;
 using namespace icu::number::impl;
 

icu4c/source/i18n/number_scientific.cpp

@@ -11,6 +11,8 @@
 #include "number_stringbuilder.h"
 #include "unicode/unum.h"
 
+using namespace icu;
+using namespace icu::number;
 using namespace icu::number::impl;
 
 // NOTE: The object lifecycle of ScientificModifier and ScientificHandler differ greatly in Java and C++.

icu4c/source/i18n/number_stringbuilder.cpp

@@ -10,6 +10,7 @@
 #include "uvectr32.h"
 
 using namespace icu;
+using namespace icu::number;
 using namespace icu::number::impl;
 
 namespace {