From 160ad69219d995b3d3c4dfc8ff92821d345a4a97 Mon Sep 17 00:00:00 2001 From: Norbert Runge Date: Wed, 19 Sep 2018 12:49:00 -0700 Subject: [PATCH 1/2] ICU-20119 Smalles fixes for public and internal header test failures. --- icu4c/source/common/unicode/uniset.h | 2 ++ icu4c/source/i18n/erarules.h | 1 + icu4c/source/test/hdrtst/cxxfiles.txt | 1 + 3 files changed, 4 insertions(+) diff --git a/icu4c/source/common/unicode/uniset.h b/icu4c/source/common/unicode/uniset.h index bd9aa5600df..9c17e6ec58b 100644 --- a/icu4c/source/common/unicode/uniset.h +++ b/icu4c/source/common/unicode/uniset.h @@ -1637,9 +1637,11 @@ private: const UnicodeSet* inclusions, UErrorCode &status); +#ifndef U_HIDE_DRAFT_API void applyIntPropertyValue(const UCPMap *map, UCPMapValueFilter *filter, const void *context, UErrorCode &errorCode); +#endif /** * Set the new pattern to cache. diff --git a/icu4c/source/i18n/erarules.h b/icu4c/source/i18n/erarules.h index 281420a5aa5..f1d4059f59d 100644 --- a/icu4c/source/i18n/erarules.h +++ b/icu4c/source/i18n/erarules.h @@ -4,6 +4,7 @@ #ifndef ERARULES_H_ #define ERARULES_H_ +#include "unicode/localpointer.h" #include "unicode/utypes.h" #if !UCONFIG_NO_FORMATTING diff --git a/icu4c/source/test/hdrtst/cxxfiles.txt b/icu4c/source/test/hdrtst/cxxfiles.txt index afe1ff1796f..2084d615737 100644 --- a/icu4c/source/test/hdrtst/cxxfiles.txt +++ b/icu4c/source/test/hdrtst/cxxfiles.txt @@ -68,6 +68,7 @@ normalizer2.h normlzr.h nounit.h numberformatter.h +numberrangeformatter.h numfmt.h numsys.h parsepos.h From 764281e4637253b4dab33cb765ab2d099b623e3e Mon Sep 17 00:00:00 2001 From: Norbert Runge Date: Wed, 19 Sep 2018 13:55:50 -0700 Subject: [PATCH 2/2] ICU-20119 Adds comment to change that fixes a header test failure. --- icu4c/source/common/unicode/uniset.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icu4c/source/common/unicode/uniset.h b/icu4c/source/common/unicode/uniset.h index 9c17e6ec58b..676dea8891c 100644 --- a/icu4c/source/common/unicode/uniset.h +++ b/icu4c/source/common/unicode/uniset.h @@ -1637,7 +1637,7 @@ private: const UnicodeSet* inclusions, UErrorCode &status); -#ifndef U_HIDE_DRAFT_API +#ifndef U_HIDE_DRAFT_API // Skipped: ucpmap.h is draft only. void applyIntPropertyValue(const UCPMap *map, UCPMapValueFilter *filter, const void *context, UErrorCode &errorCode);