From: Michael Ow <mow@svn.icu-project.org>
Date: Tue, 22 Sep 2015 16:24:52 +0000 (+0000)
Subject: ICU-11917 Check in some uconfig test error fixes
X-Git-Tag: milestone-59-0-1~841
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f3551c762344ddbfd5418560564a2545171831c;p=icu

ICU-11917 Check in some uconfig test error fixes

X-SVN-Rev: 37986
---

diff --git a/icu4c/source/i18n/affixpatternparser.cpp b/icu4c/source/i18n/affixpatternparser.cpp
index e779a600c09..41eadef2b3a 100644
--- a/icu4c/source/i18n/affixpatternparser.cpp
+++ b/icu4c/source/i18n/affixpatternparser.cpp
@@ -5,6 +5,9 @@
  * file name: affixpatternparser.cpp
  */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
 
 #include "unicode/dcfmtsym.h"
 #include "unicode/plurrule.h"
@@ -686,4 +689,4 @@ AffixPatternParser::parse(
 
 
 U_NAMESPACE_END
-
+#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/affixpatternparser.h b/icu4c/source/i18n/affixpatternparser.h
index b35dcc03907..bf6fbe6eec0 100644
--- a/icu4c/source/i18n/affixpatternparser.h
+++ b/icu4c/source/i18n/affixpatternparser.h
@@ -12,9 +12,12 @@
 #ifndef __AFFIX_PATTERN_PARSER_H__
 #define __AFFIX_PATTERN_PARSER_H__
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/unistr.h"
 #include "unicode/uobject.h"
-#include "unicode/utypes.h"
 #include "pluralaffix.h"
 
 U_NAMESPACE_BEGIN
@@ -393,5 +396,5 @@ UnicodeString fPositive;
 
 
 U_NAMESPACE_END
-
+#endif /* #if !UCONFIG_NO_FORMATTING */
 #endif  // __AFFIX_PATTERN_PARSER_H__
diff --git a/icu4c/source/i18n/decimfmtimpl.cpp b/icu4c/source/i18n/decimfmtimpl.cpp
index 76edd4b4474..8493ecd0377 100644
--- a/icu4c/source/i18n/decimfmtimpl.cpp
+++ b/icu4c/source/i18n/decimfmtimpl.cpp
@@ -5,6 +5,10 @@
  * file name: decimfmtimpl.cpp
  */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include <math.h>
 #include "unicode/numfmt.h"
 #include "unicode/plurrule.h"
@@ -1586,5 +1590,5 @@ DecimalFormatImpl::isParseFastpath() const {
 
 U_NAMESPACE_END
 
-
+#endif /* #if !UCONFIG_NO_FORMATTING */
 
diff --git a/icu4c/source/i18n/decimfmtimpl.h b/icu4c/source/i18n/decimfmtimpl.h
index 4bd4339d0dd..9193d57e8f5 100644
--- a/icu4c/source/i18n/decimfmtimpl.h
+++ b/icu4c/source/i18n/decimfmtimpl.h
@@ -11,9 +11,12 @@
 #ifndef DECIMFMTIMPL_H
 #define DECIMFMTIMPL_H
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/decimfmt.h"
 #include "unicode/uobject.h"
-#include "unicode/utypes.h"
 #include "affixpatternparser.h"
 #include "digitaffixesandpadding.h"
 #include "digitformatter.h"
@@ -539,6 +542,6 @@ friend class DecimalFormat;
 
 
 U_NAMESPACE_END
-
+#endif /* #if !UCONFIG_NO_FORMATTING */
 #endif // DECIMFMTIMPL_H
 //eof
diff --git a/icu4c/source/i18n/digitaffix.cpp b/icu4c/source/i18n/digitaffix.cpp
index 0a5f209eeae..1dd3ea998b6 100644
--- a/icu4c/source/i18n/digitaffix.cpp
+++ b/icu4c/source/i18n/digitaffix.cpp
@@ -7,6 +7,8 @@
 
 #include "unicode/utypes.h"
 
+#if !UCONFIG_NO_FORMATTING
+
 #include "digitaffix.h"
 #include "fphdlimp.h"
 #include "uassert.h"
@@ -102,3 +104,4 @@ DigitAffix::format(FieldPositionHandler &handler, UnicodeString &appendTo) const
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/digitaffix.h b/icu4c/source/i18n/digitaffix.h
index f78915a7792..d5b545a3d75 100644
--- a/icu4c/source/i18n/digitaffix.h
+++ b/icu4c/source/i18n/digitaffix.h
@@ -12,9 +12,12 @@
 #ifndef __DIGITAFFIX_H__
 #define __DIGITAFFIX_H__
 
+#include "unicode/uobject.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/unistr.h"
 #include "unicode/unum.h"
-#include "unicode/uobject.h"
 #include "unicode/utypes.h"
 
 U_NAMESPACE_BEGIN
@@ -95,5 +98,5 @@ private:
 
 
 U_NAMESPACE_END
-
+#endif // #if !UCONFIG_NO_FORMATTING
 #endif  // __DIGITAFFIX_H__
diff --git a/icu4c/source/i18n/digitaffixesandpadding.cpp b/icu4c/source/i18n/digitaffixesandpadding.cpp
index e85aaabfc11..d941a573de8 100644
--- a/icu4c/source/i18n/digitaffixesandpadding.cpp
+++ b/icu4c/source/i18n/digitaffixesandpadding.cpp
@@ -5,6 +5,9 @@
  * file name: digitaffixesandpadding.cpp
  */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
 
 #include "unicode/plurrule.h"
 #include "charstr.h"
@@ -167,4 +170,4 @@ DigitAffixesAndPadding::appendPadding(int32_t paddingCount, UnicodeString &appen
 
 
 U_NAMESPACE_END
-
+#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/digitaffixesandpadding.h b/icu4c/source/i18n/digitaffixesandpadding.h
index 59c311e4377..6b2a5ed0568 100644
--- a/icu4c/source/i18n/digitaffixesandpadding.h
+++ b/icu4c/source/i18n/digitaffixesandpadding.h
@@ -12,8 +12,11 @@
 #ifndef __DIGITAFFIXESANDPADDING_H__
 #define __DIGITAFFIXESANDPADDING_H__
 
-#include "unicode/uobject.h"
 #include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
+#include "unicode/uobject.h"
 #include "pluralaffix.h"
 
 U_NAMESPACE_BEGIN
@@ -170,5 +173,5 @@ UnicodeString &appendPadding(int32_t paddingCount, UnicodeString &appendTo) cons
 
 
 U_NAMESPACE_END
-
+#endif /* #if !UCONFIG_NO_FORMATTING */
 #endif  // __DIGITAFFIXANDPADDING_H__
diff --git a/icu4c/source/i18n/digitformatter.cpp b/icu4c/source/i18n/digitformatter.cpp
index ed14cb83a45..531eb385025 100644
--- a/icu4c/source/i18n/digitformatter.cpp
+++ b/icu4c/source/i18n/digitformatter.cpp
@@ -5,9 +5,12 @@
  * file name: digitformatter.cpp
  */
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/dcfmtsym.h"
 #include "unicode/unum.h"
-#include "unicode/utypes.h"
 
 #include "digitformatter.h"
 #include "digitgrouping.h"
@@ -409,3 +412,4 @@ DigitFormatter::equals(const DigitFormatter &rhs) const {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/digitformatter.h b/icu4c/source/i18n/digitformatter.h
index 63f80d0c483..cf339f598d6 100644
--- a/icu4c/source/i18n/digitformatter.h
+++ b/icu4c/source/i18n/digitformatter.h
@@ -12,9 +12,12 @@
 #ifndef __DIGITFORMATTER_H__
 #define __DIGITFORMATTER_H__
 
-#include "unicode/unistr.h"
 #include "unicode/uobject.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/utypes.h"
+#include "unicode/unistr.h"
 #include "digitaffix.h"
 
 U_NAMESPACE_BEGIN
@@ -279,5 +282,5 @@ int32_t countChar32ForExponent(
 
 
 U_NAMESPACE_END
-
+#endif /* #if !UCONFIG_NO_FORMATTING */
 #endif  // __DIGITFORMATTER_H__
diff --git a/icu4c/source/i18n/pluralaffix.cpp b/icu4c/source/i18n/pluralaffix.cpp
index dfe9f0a0137..b541f120df5 100644
--- a/icu4c/source/i18n/pluralaffix.cpp
+++ b/icu4c/source/i18n/pluralaffix.cpp
@@ -7,6 +7,8 @@
 
 #include "unicode/utypes.h"
 
+#if !UCONFIG_NO_FORMATTING
+
 #include "cstring.h"
 #include "digitaffix.h"
 #include "pluralaffix.h"
@@ -97,3 +99,4 @@ PluralAffix::hasMultipleVariants() const {
 
 U_NAMESPACE_END
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/pluralaffix.h b/icu4c/source/i18n/pluralaffix.h
index b9ba36f95e2..7ec7d0ac40f 100644
--- a/icu4c/source/i18n/pluralaffix.h
+++ b/icu4c/source/i18n/pluralaffix.h
@@ -12,9 +12,12 @@
 #ifndef __PLURALAFFIX_H__
 #define __PLURALAFFIX_H__
 
+#include "unicode/utypes.h"
+
+#if !UCONFIG_NO_FORMATTING
+
 #include "unicode/unum.h"
 #include "unicode/uobject.h"
-#include "unicode/utypes.h"
 
 #include "digitaffix.h"
 #include "pluralmap.h"
@@ -168,5 +171,5 @@ private:
 
 
 U_NAMESPACE_END
-
+#endif /* #if !UCONFIG_NO_FORMATTING */
 #endif  // __PLURALAFFIX_H__
diff --git a/icu4c/source/i18n/precision.cpp b/icu4c/source/i18n/precision.cpp
index e916abb4a41..5f28391ef10 100644
--- a/icu4c/source/i18n/precision.cpp
+++ b/icu4c/source/i18n/precision.cpp
@@ -9,6 +9,8 @@
 
 #include "unicode/utypes.h"
 
+#if !UCONFIG_NO_FORMATTING
+
 #include "digitlst.h"
 #include "fmtableimp.h"
 #include "precision.h"
@@ -437,4 +439,4 @@ ScientificPrecision::initVisibleDigitsWithExponent(
 
 
 U_NAMESPACE_END
-
+#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/precision.h b/icu4c/source/i18n/precision.h
index da9833f1e8b..772721677cc 100644
--- a/icu4c/source/i18n/precision.h
+++ b/icu4c/source/i18n/precision.h
@@ -13,6 +13,8 @@
 #define __PRECISION_H__
 
 #include "unicode/uobject.h"
+
+#if !UCONFIG_NO_FORMATTING
 #include "unicode/utypes.h"
 
 #include "digitinterval.h"
@@ -315,5 +317,5 @@ private:
 
 
 U_NAMESPACE_END
-
+#endif // #if !UCONFIG_NO_FORMATTING
 #endif  // __PRECISION_H__
diff --git a/icu4c/source/i18n/visibledigits.cpp b/icu4c/source/i18n/visibledigits.cpp
index 4a46dc8b29d..a6cbd0fdce2 100644
--- a/icu4c/source/i18n/visibledigits.cpp
+++ b/icu4c/source/i18n/visibledigits.cpp
@@ -9,6 +9,8 @@
 
 #include "unicode/utypes.h"
 
+#if !UCONFIG_NO_FORMATTING
+
 #include "cstring.h"
 #include "decNumber.h"
 #include "digitlst.h"
@@ -182,4 +184,4 @@ void VisibleDigits::getFixedDecimal(
 }
 
 U_NAMESPACE_END
-
+#endif /* #if !UCONFIG_NO_FORMATTING */
diff --git a/icu4c/source/i18n/visibledigits.h b/icu4c/source/i18n/visibledigits.h
index 5c48556178d..88598d79137 100644
--- a/icu4c/source/i18n/visibledigits.h
+++ b/icu4c/source/i18n/visibledigits.h
@@ -11,9 +11,12 @@
 #ifndef __VISIBLEDIGITS_H__
 #define __VISIBLEDIGITS_H__
 
-#include "unicode/uobject.h"
 #include "unicode/utypes.h"
 
+#if !UCONFIG_NO_FORMATTING
+
+#include "unicode/uobject.h"
+
 #include "charstr.h"
 #include "digitinterval.h"
 
@@ -153,5 +156,5 @@ private:
 
 
 U_NAMESPACE_END
-
+#endif /* #if !UCONFIG_NO_FORMATTING */
 #endif  // __VISIBLEDIGITS_H__
diff --git a/icu4c/source/test/intltest/unifiedcachetest.cpp b/icu4c/source/test/intltest/unifiedcachetest.cpp
index 1f5a3bf6da9..d48b3e80c09 100644
--- a/icu4c/source/test/intltest/unifiedcachetest.cpp
+++ b/icu4c/source/test/intltest/unifiedcachetest.cpp
@@ -89,6 +89,7 @@ void UnifiedCacheTest::runIndexedTest(int32_t index, UBool exec, const char* &na
 }
 
 void UnifiedCacheTest::TestEvictionUnderStress() {
+#if !UCONFIG_NO_FORMATTING
     int32_t localeCount;
     const Locale *locales = DateFormat::getAvailableLocales(localeCount);
     UErrorCode status = U_ZERO_ERROR;
@@ -102,6 +103,7 @@ void UnifiedCacheTest::TestEvictionUnderStress() {
         dataerrln("%s:%d Items should have been evicted from cache",
                __FILE__, __LINE__);
     }
+#endif /* #if !UCONFIG_NO_FORMATTING */
 }
 
 void UnifiedCacheTest::TestEvictionPolicy() {