ICU-11917 Check in some uconfig test error fixes

X-SVN-Rev: 37986
This commit is contained in:
Michael Ow 2015-09-22 16:24:52 +00:00
parent 990774fbd4
commit 0f3551c762
17 changed files with 70 additions and 21 deletions

View file

@ -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 */

View file

@ -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__

View file

@ -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 */

View file

@ -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

View file

@ -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 */

View file

@ -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__

View file

@ -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 */

View file

@ -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__

View file

@ -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 */

View file

@ -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__

View file

@ -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 */

View file

@ -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__

View file

@ -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 */

View file

@ -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__

View file

@ -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 */

View file

@ -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__

View file

@ -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() {