From: Shane Carr Date: Wed, 25 Oct 2017 00:25:04 +0000 (+0000) Subject: ICU-13411 Making "using namespace" statements consistent across number formatting... X-Git-Tag: release-61-rc~207 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ec3a8c6bba07462d7e3342eb25afb0552df8490;p=icu ICU-13411 Making "using namespace" statements consistent across number formatting cpp files. X-SVN-Rev: 40630 --- diff --git a/icu4c/source/i18n/number_affixutils.cpp b/icu4c/source/i18n/number_affixutils.cpp index 0e993cc5165..4dfdbc7ab70 100644 --- a/icu4c/source/i18n/number_affixutils.cpp +++ b/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; diff --git a/icu4c/source/i18n/number_compact.cpp b/icu4c/source/i18n/number_compact.cpp index d8f3ced07ba..8ceee1378b2 100644 --- a/icu4c/source/i18n/number_compact.cpp +++ b/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 { diff --git a/icu4c/source/i18n/number_decimalquantity.cpp b/icu4c/source/i18n/number_decimalquantity.cpp index af6223ecb7e..72463576666 100644 --- a/icu4c/source/i18n/number_decimalquantity.cpp +++ b/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 { diff --git a/icu4c/source/i18n/number_decimfmtprops.cpp b/icu4c/source/i18n/number_decimfmtprops.cpp index 36aad6971e8..cc57cfce6ac 100644 --- a/icu4c/source/i18n/number_decimfmtprops.cpp +++ b/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() { diff --git a/icu4c/source/i18n/number_formatimpl.cpp b/icu4c/source/i18n/number_formatimpl.cpp index 0741a9dd116..9986ce6d8c6 100644 --- a/icu4c/source/i18n/number_formatimpl.cpp +++ b/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 { diff --git a/icu4c/source/i18n/number_grouping.cpp b/icu4c/source/i18n/number_grouping.cpp index 15eb857eacd..15362825cc6 100644 --- a/icu4c/source/i18n/number_grouping.cpp +++ b/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}; diff --git a/icu4c/source/i18n/number_integerwidth.cpp b/icu4c/source/i18n/number_integerwidth.cpp index d64bfde49c5..61a74acf6c7 100644 --- a/icu4c/source/i18n/number_integerwidth.cpp +++ b/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; diff --git a/icu4c/source/i18n/number_longnames.cpp b/icu4c/source/i18n/number_longnames.cpp index 77385132c74..88b3413585a 100644 --- a/icu4c/source/i18n/number_longnames.cpp +++ b/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 { diff --git a/icu4c/source/i18n/number_modifiers.cpp b/icu4c/source/i18n/number_modifiers.cpp index d95113a0310..a19b12d11ed 100644 --- a/icu4c/source/i18n/number_modifiers.cpp +++ b/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 { diff --git a/icu4c/source/i18n/number_notation.cpp b/icu4c/source/i18n/number_notation.cpp index b681a8faa42..b5a7ee5bcb5 100644 --- a/icu4c/source/i18n/number_notation.cpp +++ b/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; diff --git a/icu4c/source/i18n/number_padding.cpp b/icu4c/source/i18n/number_padding.cpp index 1e59018d31f..e5e2f8603ef 100644 --- a/icu4c/source/i18n/number_padding.cpp +++ b/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 { diff --git a/icu4c/source/i18n/number_patternmodifier.cpp b/icu4c/source/i18n/number_patternmodifier.cpp index 0bbc9bdc9f0..0599f92a4f3 100644 --- a/icu4c/source/i18n/number_patternmodifier.cpp +++ b/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) {} diff --git a/icu4c/source/i18n/number_patternstring.cpp b/icu4c/source/i18n/number_patternstring.cpp index 5de8ec62521..c67e3541816 100644 --- a/icu4c/source/i18n/number_patternstring.cpp +++ b/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) { diff --git a/icu4c/source/i18n/number_rounding.cpp b/icu4c/source/i18n/number_rounding.cpp index ad5d2d8d700..38b40ab3d9e 100644 --- a/icu4c/source/i18n/number_rounding.cpp +++ b/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; diff --git a/icu4c/source/i18n/number_scientific.cpp b/icu4c/source/i18n/number_scientific.cpp index c1b3dcc3fb8..0557adb63e3 100644 --- a/icu4c/source/i18n/number_scientific.cpp +++ b/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++. diff --git a/icu4c/source/i18n/number_stringbuilder.cpp b/icu4c/source/i18n/number_stringbuilder.cpp index 698e6b29298..e6e86bd4291 100644 --- a/icu4c/source/i18n/number_stringbuilder.cpp +++ b/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 {