ICU-20438 Fixes issues found during BRS configuration test task.

diff --git a/icu4c/source/common/characterproperties.cpp b/icu4c/source/common/characterproperties.cpp
index ed45b7f2266a2acb2def7122f75a02561fe7aa2b..96186e6418192eb2e68073112b91538a4fdb9c94 100644 (file)
--- a/icu4c/source/common/characterproperties.cpp
+++ b/icu4c/source/common/characterproperties.cpp
@@ -24,8 +24,10 @@
 #include "uprops.h"
 
 using icu::LocalPointer;
+#if !UCONFIG_NO_NORMALIZATION
 using icu::Normalizer2Factory;
 using icu::Normalizer2Impl;
+#endif
 using icu::UInitOnce;
 using icu::UnicodeSet;
 

diff --git a/icu4c/source/i18n/listformatter.cpp b/icu4c/source/i18n/listformatter.cpp
index 68814211cdf70783cb7d08760192b0246c5c05d7..ab8ef14311ea6545bf004ac75a83b7b8601d045a 100644 (file)
--- a/icu4c/source/i18n/listformatter.cpp
+++ b/icu4c/source/i18n/listformatter.cpp
@@ -66,6 +66,7 @@ ListFormatInternal(const ListFormatInternal &other) :
 };
 
 
+#if !UCONFIG_NO_FORMATTING
 class FormattedListData : public FormattedValueFieldPositionIteratorImpl {
 public:
     FormattedListData(UErrorCode& status) : FormattedValueFieldPositionIteratorImpl(5, status) {}
@@ -75,6 +76,7 @@ public:
 FormattedListData::~FormattedListData() = default;
 
 UPRV_FORMATTED_VALUE_SUBCLASS_AUTO_IMPL(FormattedList)
+#endif
 
 
 static Hashtable* listPatternHash = nullptr;

diff --git a/icu4c/source/test/intltest/listformattertest.h b/icu4c/source/test/intltest/listformattertest.h
index f9d5a426b741ddb4423ba4edec3f752388f2604e..decd13bcf6a01a2aa85717f3b12967dfd5621ad0 100644 (file)
--- a/icu4c/source/test/intltest/listformattertest.h
+++ b/icu4c/source/test/intltest/listformattertest.h
@@ -24,6 +24,8 @@
 #include "intltest.h"
 #include "itformat.h"
 
+#if !UCONFIG_NO_FORMATTING
+
 class ListFormatterTest : public IntlTestWithFieldPosition {
   public:
     ListFormatterTest();
@@ -125,4 +127,6 @@ class ListFormatterTest : public IntlTestWithFieldPosition {
     const UnicodeString four;
 };
 
+#endif /* #if !UCONFIG_NO_FORMATTING */
+
 #endif