commit c28e2510c440387f7c6429b2d5d237425105abf2
author Norbert Runge <nrunge@google.com> Thu Sep 20 09:03:58 2018 -0700
committer Shane Carr <shane@unicode.org> Thu Sep 27 14:27:41 2018 -0700
tree c49b94bb314c0f108b11a23a2d6d2fa521934c85
parent 764281e4637253b4dab33cb765ab2d099b623e3e
parent 35e63d4ade8caddf62836085015d9ec2b2125c75

ICU-20119 Merge github.com:unicode-org/icu into icu63_1

icu4c/source/common/unicode/uniset.h

diff --git a/icu4c/source/common/unicode/uniset.h b/icu4c/source/common/unicode/uniset.h
index bd9aa56..676dea8 100644
--- a/icu4c/source/common/unicode/uniset.h
+++ b/icu4c/source/common/unicode/uniset.h
@@ -1637,9 +1637,11 @@ class U_COMMON_API UnicodeSet U_FINAL : public UnicodeFilter {
                      const UnicodeSet* inclusions,
                      UErrorCode &status);
 
+#ifndef U_HIDE_DRAFT_API   // Skipped: ucpmap.h is draft only.
     void applyIntPropertyValue(const UCPMap *map,
                                UCPMapValueFilter *filter, const void *context,
                                UErrorCode &errorCode);
+#endif
 
     /**
      * Set the new pattern to cache.

icu4c/source/i18n/erarules.h

diff --git a/icu4c/source/i18n/erarules.h b/icu4c/source/i18n/erarules.h
index 281420a..f1d4059 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

icu4c/source/test/hdrtst/cxxfiles.txt

diff --git a/icu4c/source/test/hdrtst/cxxfiles.txt b/icu4c/source/test/hdrtst/cxxfiles.txt
index afe1ff1..2084d61 100644
--- a/icu4c/source/test/hdrtst/cxxfiles.txt
+++ b/icu4c/source/test/hdrtst/cxxfiles.txt
@@ -68,6 +68,7 @@
 normlzr.h
 nounit.h
 numberformatter.h
+numberrangeformatter.h
 numfmt.h
 numsys.h
 parsepos.h