From b6c8bac9bb2e4449dfc5a9765f0fc333ed3f7624 Mon Sep 17 00:00:00 2001 From: Norbert Runge Date: Wed, 4 Oct 2017 19:54:30 +0000 Subject: [PATCH] ICU-13384 Fixes ICU4C header check failures, blacklists files that are C++ only, adds a directory to test script. X-SVN-Rev: 40549 --- icu4c/source/common/ucasemap_imp.h | 2 ++ icu4c/source/test/hdrtst/cxxfiles.txt | 2 ++ icu4c/source/test/hdrtst/testinternalheaders.sh | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/icu4c/source/common/ucasemap_imp.h b/icu4c/source/common/ucasemap_imp.h index ad9d52ec320..99a64902794 100644 --- a/icu4c/source/common/ucasemap_imp.h +++ b/icu4c/source/common/ucasemap_imp.h @@ -73,7 +73,9 @@ uprv_haveProperties(UErrorCode *pErrorCode); U_NAMESPACE_BEGIN +class BreakIterator; // unicode/brkiter.h class ByteSink; +class Locale; // unicode/locid.h /** Returns TRUE if the options are valid. Otherwise FALSE, and sets an error. */ inline UBool ustrcase_checkTitleAdjustmentOptions(uint32_t options, UErrorCode &errorCode) { diff --git a/icu4c/source/test/hdrtst/cxxfiles.txt b/icu4c/source/test/hdrtst/cxxfiles.txt index ea6984e02b2..afe1ff1796f 100644 --- a/icu4c/source/test/hdrtst/cxxfiles.txt +++ b/icu4c/source/test/hdrtst/cxxfiles.txt @@ -66,6 +66,8 @@ messagepattern.h msgfmt.h normalizer2.h normlzr.h +nounit.h +numberformatter.h numfmt.h numsys.h parsepos.h diff --git a/icu4c/source/test/hdrtst/testinternalheaders.sh b/icu4c/source/test/hdrtst/testinternalheaders.sh index afff9a2104d..957b21080b4 100755 --- a/icu4c/source/test/hdrtst/testinternalheaders.sh +++ b/icu4c/source/test/hdrtst/testinternalheaders.sh @@ -58,8 +58,8 @@ done ; # We don't want to patch it, and don't want to spend the time for this script here # to know about C-only header files. -for tool in genccode gencmn gencolusb gennorm2 genren gentest icupkg icuswap pkgdata \ - genbrk gencfu gencnval gendict genrb gensprep icuinfo makeconv memcheck; do +for tool in escapesrc genccode gencmn gencolusb gennorm2 genren gentest icupkg icuswap \ + pkgdata genbrk gencfu gencnval gendict genrb gensprep icuinfo makeconv memcheck; do for file in `ls tools/$tool/*.h`; do echo $file echo '#include "'$file'"' > ht_temp.cpp ;