ICU-9721 Fix some uconfig test failures

X-SVN-Rev: 33311

diff --git a/icu4c/source/i18n/identifier_info.cpp b/icu4c/source/i18n/identifier_info.cpp
index a25ffea794ad2da782c1f54cab3e59df642c63be..369a0678c59f41579cbfbf5423d3786bbbef35d7 100644 (file)
--- a/icu4c/source/i18n/identifier_info.cpp
+++ b/icu4c/source/i18n/identifier_info.cpp
@@ -228,6 +228,8 @@ const ScriptSet *IdentifierInfo::getCommonAmongAlternates() const {
     return fCommonAmongAlternates;
 }
 
+#if !UCONFIG_NO_NORMALIZATION
+
 URestrictionLevel IdentifierInfo::getRestrictionLevel(UErrorCode &status) const {
     if (!fIdentifierProfile->containsAll(*fIdentifier) || getNumerics()->size() > 1) {
         return USPOOF_UNRESTRICTIVE;
@@ -259,6 +261,8 @@ URestrictionLevel IdentifierInfo::getRestrictionLevel(UErrorCode &status) const
     return USPOOF_MINIMALLY_RESTRICTIVE;
 }
 
+#endif /* !UCONFIG_NO_NORMALIZATION */
+
 int32_t IdentifierInfo::getScriptCount() const {
     // Note: Common and Inherited scripts were removed by setIdentifier(), and do not appear in fRequiredScripts.
     int32_t count = fRequiredScripts->countMembers() +

diff --git a/icu4c/source/i18n/identifier_info.h b/icu4c/source/i18n/identifier_info.h
index 49c982172098058b769c507bc88026daa4ba2159..c7cab61792697fb178eefc8ba6c0ee75a082e976 100644 (file)
--- a/icu4c/source/i18n/identifier_info.h
+++ b/icu4c/source/i18n/identifier_info.h
@@ -147,6 +147,8 @@ class U_I18N_API IdentifierInfo : public UMemory {
       */
     int32_t getScriptCount() const;
 
+#if !UCONFIG_NO_NORMALIZATION
+
     /**
      * Find the "tightest" restriction level that the identifier satisfies.
      * 
@@ -155,6 +157,8 @@ class U_I18N_API IdentifierInfo : public UMemory {
      */
     URestrictionLevel getRestrictionLevel(UErrorCode &status) const;
 
+#endif /*!UCONFIG_NO_NORMALIZATION */
+
     UnicodeString toString() const;
 
     /**

diff --git a/icu4c/source/test/intltest/itspoof.cpp b/icu4c/source/test/intltest/itspoof.cpp
index fca6066804377a27c3e6ad16800db224ba722e42..50971ca87ca0e6dea204b154d4c6e5dc25e5a82e 100644 (file)
--- a/icu4c/source/test/intltest/itspoof.cpp
+++ b/icu4c/source/test/intltest/itspoof.cpp
@@ -450,7 +450,6 @@ void IntlTestSpoof::testConfData() {
         }
     }
 }
-#endif // UCONFIG_NO_REGULAR_EXPRESSIONS
 
 // testIdentifierInfo. Note that IdentifierInfo is not public ICU API at this time
 void IntlTestSpoof::testIdentifierInfo() {
@@ -754,3 +753,5 @@ void IntlTestSpoof::testMixedNumbers() {
         uspoof_close(sc);
     }
 }
+
+#endif /* !UCONFIG_NO_REGULAR_EXPRESSIONS && !UCONFIG_NO_NORMALIZATION && !UCONFIG_NO_FILE_IO */