From: Norbert Runge <nrunge@google.com>
Date: Thu, 31 May 2018 21:53:43 +0000 (+0000)
Subject: ICU-13667 Fixes compilation errors related to UCONFIG_NO_XXX flag variations.
X-Git-Tag: release-62-rc~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51688fda2578def368bab345100a34984408fbf4;p=icu

ICU-13667 Fixes compilation errors related to UCONFIG_NO_XXX flag variations.

X-SVN-Rev: 41494
---

diff --git a/icu4c/source/test/intltest/itutil.cpp b/icu4c/source/test/intltest/itutil.cpp
index 7f969d9ad8f..7b2995f7ccd 100644
--- a/icu4c/source/test/intltest/itutil.cpp
+++ b/icu4c/source/test/intltest/itutil.cpp
@@ -40,7 +40,9 @@ extern IntlTest *createSimpleFormatterTest();
 extern IntlTest *createUnifiedCacheTest();
 extern IntlTest *createQuantityFormatterTest();
 extern IntlTest *createPluralMapTest();
+#if !UCONFIG_NO_FORMATTING
 extern IntlTest *createStaticUnicodeSetsTest();
+#endif
 
 
 #define CASE(id, test) case id:                               \
@@ -138,11 +140,13 @@ void IntlTestUtilities::runIndexedTest( int32_t index, UBool exec, const char* &
             break;
         case 24:
             name = "StaticUnicodeSetsTest";
+#if !UCONFIG_NO_FORMATTING
             if (exec) {
                 logln("TestSuite StaticUnicodeSetsTest---"); logln();
                 LocalPointer<IntlTest> test(createStaticUnicodeSetsTest());
                 callTest(*test, par);
             }
+#endif
             break;
         default: name = ""; break; //needed to end loop
     }
diff --git a/icu4c/source/test/intltest/strcase.cpp b/icu4c/source/test/intltest/strcase.cpp
index 238c80ac9d3..fe983da181c 100644
--- a/icu4c/source/test/intltest/strcase.cpp
+++ b/icu4c/source/test/intltest/strcase.cpp
@@ -1534,6 +1534,7 @@ void StringCaseTest::TestInPlaceTitle() {
     assertEquals("u_strToTitle(in-place) length", u_strlen(expected), length);
     assertEquals("u_strToTitle(in-place)", expected, s);
 }
+#endif
 
 void StringCaseTest::TestCaseMapEditsIteratorDocs() {
     IcuTestErrorCode status(*this, "TestCaseMapEditsIteratorDocs");
@@ -1684,4 +1685,4 @@ void StringCaseTest::TestCaseMapEditsIteratorDocs() {
     }
 }
 
-#endif
+//#endif
diff --git a/icu4c/source/test/intltest/tsmthred.cpp b/icu4c/source/test/intltest/tsmthred.cpp
index d0d7a1e475d..eb7b882f5a0 100644
--- a/icu4c/source/test/intltest/tsmthred.cpp
+++ b/icu4c/source/test/intltest/tsmthred.cpp
@@ -78,8 +78,10 @@ void MultithreadTest::runIndexedTest( int32_t index, UBool exec,
     TESTCASE_AUTO(TestAnyTranslit);
     TESTCASE_AUTO(TestConditionVariables);
     TESTCASE_AUTO(TestUnifiedCache);
+#if !UCONFIG_NO_TRANSLITERATION
     TESTCASE_AUTO(TestBreakTranslit);
     TESTCASE_AUTO(TestIncDec);
+#endif /* #if !UCONFIG_NO_TRANSLITERATION */
     TESTCASE_AUTO_END
 }