From 063a23b68cd97d70e668cc6b3d5491017c793b1a Mon Sep 17 00:00:00 2001
From: "Shane F. Carr" <shane@unicode.org>
Date: Fri, 27 Oct 2023 11:33:43 -0700
Subject: [PATCH] Update loclikelysubtags.cpp

---
 icu4c/source/common/loclikelysubtags.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/icu4c/source/common/loclikelysubtags.cpp b/icu4c/source/common/loclikelysubtags.cpp
index 6136f2e4c7ee..0459520a731d 100644
--- a/icu4c/source/common/loclikelysubtags.cpp
+++ b/icu4c/source/common/loclikelysubtags.cpp
@@ -398,6 +398,7 @@ static void processMacroregionRange(const UnicodeString& regionName, UVector* ne
     }
 }
 
+#if U_DEBUG
 UVector* loadMacroregions(UErrorCode &status) {
     LocalPointer<UVector> newMacroRegions(new UVector(uprv_deleteUObject, uhash_compareUnicodeString, status), status);
 
@@ -420,6 +421,7 @@ UVector* loadMacroregions(UErrorCode &status) {
 
     return newMacroRegions.orphan();
 }
+#endif // U_DEBUG
 
 UVector* getStaticMacroregions(UErrorCode &status) {
     LocalPointer<UVector> newMacroRegions(new UVector(uprv_deleteUObject, uhash_compareUnicodeString, status), status);
@@ -428,8 +430,8 @@ UVector* getStaticMacroregions(UErrorCode &status) {
         return nullptr;
     }
 
-    for (size_t i=0; i<UPRV_LENGTHOF(MACROREGION_HARDCODE); i++) {
-        UnicodeString regionName(MACROREGION_HARDCODE[i]);
+    for (const auto *region : MACROREGION_HARDCODE) {
+        UnicodeString regionName(region);
         processMacroregionRange(regionName, newMacroRegions.getAlias(), status);
         if (U_FAILURE(status)) {
             return nullptr;
@@ -479,7 +481,7 @@ XLikelySubtags::XLikelySubtags(XLikelySubtagsData &data) :
         lsrs(data.lsrs),
 #if U_DEBUG
         lsrsLength(data.lsrsLength),
-#endif
+#endif // U_DEBUG
         distanceData(std::move(data.distanceData)) {
     data.langInfoBundle = nullptr;
     data.lsrs = nullptr;