3 files changed, 22 insertions, 34 deletions

diff --git a/thirdparty/icu4c/i18n/scriptset.cpp b/thirdparty/icu4c/i18n/scriptset.cpp
index 736a85cf8c..eec1eeb37d 100644
--- a/thirdparty/icu4c/i18n/scriptset.cpp
+++ b/thirdparty/icu4c/i18n/scriptset.cpp
@@ -57,7 +57,7 @@ UBool ScriptSet::test(UScriptCode script, UErrorCode &status) const {
     if (U_FAILURE(status)) {
         return false;
     }
-    if (script < 0 || (int32_t)script >= SCRIPT_LIMIT) {
+    if (script < 0 || static_cast<int32_t>(script) >= SCRIPT_LIMIT) {
         status = U_ILLEGAL_ARGUMENT_ERROR;
         return false;
     }
@@ -71,7 +71,7 @@ ScriptSet &ScriptSet::set(UScriptCode script, UErrorCode &status) {
     if (U_FAILURE(status)) {
         return *this;
     }
-    if (script < 0 || (int32_t)script >= SCRIPT_LIMIT) {
+    if (script < 0 || static_cast<int32_t>(script) >= SCRIPT_LIMIT) {
         status = U_ILLEGAL_ARGUMENT_ERROR;
         return *this;
     }
@@ -85,7 +85,7 @@ ScriptSet &ScriptSet::reset(UScriptCode script, UErrorCode &status) {
     if (U_FAILURE(status)) {
         return *this;
     }
-    if (script < 0 || (int32_t)script >= SCRIPT_LIMIT) {
+    if (script < 0 || static_cast<int32_t>(script) >= SCRIPT_LIMIT) {
         status = U_ILLEGAL_ARGUMENT_ERROR;
         return *this;
     }
@@ -178,7 +178,7 @@ int32_t ScriptSet::nextSetBit(int32_t fromIndex) const {
     }
     UErrorCode status = U_ZERO_ERROR;
     for (int32_t scriptIndex = fromIndex; scriptIndex < SCRIPT_LIMIT; scriptIndex++) {
-        if (test((UScriptCode)scriptIndex, status)) {
+        if (test(static_cast<UScriptCode>(scriptIndex), status)) {
             return scriptIndex;
         }
     }
@@ -198,10 +198,10 @@ UnicodeString &ScriptSet::displayScripts(UnicodeString &dest) const {
     UBool firstTime = true;
     for (int32_t i = nextSetBit(0); i >= 0; i = nextSetBit(i + 1)) {
         if (!firstTime) {
-            dest.append((char16_t)0x20);
+            dest.append(static_cast<char16_t>(0x20));
         }
         firstTime = false;
-        const char *scriptName = uscript_getShortName((UScriptCode(i)));
+        const char* scriptName = uscript_getShortName(static_cast<UScriptCode>(i));
         dest.append(UnicodeString(scriptName, -1, US_INV));
     }
     return dest;
@@ -230,7 +230,7 @@ ScriptSet &ScriptSet::parseScripts(const UnicodeString &scriptString, UErrorCode
             if (sc == UCHAR_INVALID_CODE) {
                 status = U_ILLEGAL_ARGUMENT_ERROR;
             } else {
-                this->set((UScriptCode)sc, status);
+                this->set(static_cast<UScriptCode>(sc), status);
             }
             if (U_FAILURE(status)) {
                 return *this;
diff --git a/thirdparty/icu4c/i18n/unicode/uspoof.h b/thirdparty/icu4c/i18n/unicode/uspoof.h
index 20d29d62b2..4e029fe951 100644
--- a/thirdparty/icu4c/i18n/unicode/uspoof.h
+++ b/thirdparty/icu4c/i18n/unicode/uspoof.h
@@ -1224,7 +1224,6 @@ uspoof_areConfusable(const USpoofChecker *sc,
                      const UChar *id2, int32_t length2,
                      UErrorCode *status);
 
-#ifndef U_HIDE_DRAFT_API
 /**
  * Check whether two specified strings are visually confusable when
  * displayed in a context with the given paragraph direction.
@@ -1269,13 +1268,12 @@ uspoof_areConfusable(const USpoofChecker *sc,
  *                enum USpoofChecks.  Zero is returned if the identifiers
  *                are not confusable.
  *
- * @draft ICU 74
+ * @stable ICU 74
  */
 U_CAPI uint32_t U_EXPORT2 uspoof_areBidiConfusable(const USpoofChecker *sc, UBiDiDirection direction,
                                                   const UChar *id1, int32_t length1,
                                                   const UChar *id2, int32_t length2,
                                                   UErrorCode *status);
-#endif /* U_HIDE_DRAFT_API */
 
 /**
  * A version of {@link uspoof_areConfusable} accepting strings in UTF-8 format.
@@ -1308,7 +1306,6 @@ uspoof_areConfusableUTF8(const USpoofChecker *sc,
                          const char *id2, int32_t length2,
                          UErrorCode *status);
 
-#ifndef U_HIDE_DRAFT_API
 /**
  * A version of {@link uspoof_areBidiConfusable} accepting strings in UTF-8 format.
  *
@@ -1332,7 +1329,7 @@ uspoof_areConfusableUTF8(const USpoofChecker *sc,
  *                enum USpoofChecks.  Zero is returned if the strings
  *                are not confusable.
  *
- * @draft ICU 74
+ * @stable ICU 74
  *
  * @see uspoof_areBidiConfusable
  */
@@ -1340,7 +1337,6 @@ U_CAPI uint32_t U_EXPORT2 uspoof_areBidiConfusableUTF8(const USpoofChecker *sc,
                                                       const char *id1, int32_t length1,
                                                       const char *id2, int32_t length2,
                                                       UErrorCode *status);
-#endif /* U_HIDE_DRAFT_API */
 
 /**
  *  Get the "skeleton" for an identifier.
@@ -1380,7 +1376,6 @@ uspoof_getSkeleton(const USpoofChecker *sc,
                    UChar *dest, int32_t destCapacity,
                    UErrorCode *status);
 
-#ifndef U_HIDE_DRAFT_API
 /**
  *  Get the "bidiSkeleton" for an identifier and a direction.
  *  Skeletons are a transformation of the input identifier;
@@ -1410,14 +1405,13 @@ uspoof_getSkeleton(const USpoofChecker *sc,
  *                is always that of the complete skeleton, even when the
  *                supplied buffer is too small (or of zero length)
  *
- * @draft ICU 74
+ * @stable ICU 74
  * @see uspoof_areBidiConfusable
  */
 U_CAPI int32_t U_EXPORT2 uspoof_getBidiSkeleton(const USpoofChecker *sc,
                                                 UBiDiDirection direction,
                                                 const UChar *id, int32_t length,
                                                 UChar *dest, int32_t destCapacity, UErrorCode *status);
-#endif /* U_HIDE_DRAFT_API */
 
 /**
  *  Get the "skeleton" for an identifier.
@@ -1459,7 +1453,6 @@ uspoof_getSkeletonUTF8(const USpoofChecker *sc,
                        char *dest, int32_t destCapacity,
                        UErrorCode *status);
 
-#ifndef U_HIDE_DRAFT_API
 /**
  *  Get the "bidiSkeleton" for an identifier and a direction.
  *  Skeletons are a transformation of the input identifier;
@@ -1492,12 +1485,11 @@ uspoof_getSkeletonUTF8(const USpoofChecker *sc,
  *                is always that of the complete skeleton, even when the
  *                supplied buffer is too small (or of zero length)
  *
- * @draft ICU 74
+ * @stable ICU 74
  */
 U_CAPI int32_t U_EXPORT2 uspoof_getBidiSkeletonUTF8(const USpoofChecker *sc, UBiDiDirection direction,
                                                     const char *id, int32_t length, char *dest,
                                                     int32_t destCapacity, UErrorCode *status);
-#endif /* U_HIDE_DRAFT_API */
 
 /**
   * Get the set of Candidate Characters for Inclusion in Identifiers, as defined
@@ -1736,7 +1728,6 @@ uspoof_areConfusableUnicodeString(const USpoofChecker *sc,
                                   const icu::UnicodeString &s2,
                                   UErrorCode *status);
 
-#ifndef U_HIDE_DRAFT_API
 /**
  * A version of {@link uspoof_areBidiConfusable} accepting UnicodeStrings.
  *
@@ -1756,7 +1747,7 @@ uspoof_areConfusableUnicodeString(const USpoofChecker *sc,
  *                enum USpoofChecks.  Zero is returned if the identifiers
  *                are not confusable.
  *
- * @draft ICU 74
+ * @stable ICU 74
  *
  * @see uspoof_areBidiConfusable
  */
@@ -1765,7 +1756,6 @@ U_CAPI uint32_t U_EXPORT2 uspoof_areBidiConfusableUnicodeString(const USpoofChec
                                                                const icu::UnicodeString &s1,
                                                                const icu::UnicodeString &s2,
                                                                UErrorCode *status);
-#endif /* U_HIDE_DRAFT_API */
 
 /**
  *  Get the "skeleton" for an identifier.
@@ -1797,7 +1787,6 @@ uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
                                 icu::UnicodeString &dest,
                                 UErrorCode *status);
 
-#ifndef U_HIDE_DRAFT_API
 /**
  *  Get the "bidiSkeleton" for an identifier and a direction.
  *  Skeletons are a transformation of the input identifier;
@@ -1820,12 +1809,11 @@ uspoof_getSkeletonUnicodeString(const USpoofChecker *sc,
  *                perform the check.
  * @return        A reference to the destination (skeleton) string.
  *
- * @draft ICU 74
+ * @stable ICU 74
  */
 U_I18N_API icu::UnicodeString &U_EXPORT2 uspoof_getBidiSkeletonUnicodeString(
     const USpoofChecker *sc, UBiDiDirection direction, const icu::UnicodeString &id,
     icu::UnicodeString &dest, UErrorCode *status);
-#endif /* U_HIDE_DRAFT_API */
 
 /**
   * Get the set of Candidate Characters for Inclusion in Identifiers, as defined
diff --git a/thirdparty/icu4c/i18n/uspoof_impl.cpp b/thirdparty/icu4c/i18n/uspoof_impl.cpp
index 93402e670b..c727fafb37 100644
--- a/thirdparty/icu4c/i18n/uspoof_impl.cpp
+++ b/thirdparty/icu4c/i18n/uspoof_impl.cpp
@@ -148,7 +148,7 @@ void SpoofImpl::setAllowedLocales(const char *localesList, UErrorCode &status) {
         if (trimmedEnd <= locStart) {
             break;
         }
-        const char *locale = uprv_strndup(locStart, (int32_t)(trimmedEnd + 1 - locStart));
+        const char* locale = uprv_strndup(locStart, static_cast<int32_t>(trimmedEnd + 1 - locStart));
         localeListCount++;
 
         // We have one locale from the locales list.
@@ -305,7 +305,7 @@ void SpoofImpl::getNumerics(const UnicodeString& input, UnicodeSet& result, UErr
         if (u_charType(codePoint) == U_DECIMAL_DIGIT_NUMBER) {
             // Store the zero character as a representative for comparison.
             // Unicode guarantees it is codePoint - value
-            result.add(codePoint - (UChar32)u_getNumericValue(codePoint));
+            result.add(codePoint - static_cast<UChar32>(u_getNumericValue(codePoint)));
         }
     }
 }
@@ -432,7 +432,7 @@ UChar32 SpoofImpl::ScanHex(const char16_t *s, int32_t start, int32_t limit, UErr
         status = U_PARSE_ERROR;
         val = 0;
     }
-    return (UChar32)val;
+    return static_cast<UChar32>(val);
 }
 
 
@@ -601,7 +601,7 @@ SpoofData::SpoofData(const void *data, int32_t length, UErrorCode &status)
     if (U_FAILURE(status)) {
         return;
     }
-    if ((size_t)length < sizeof(SpoofDataHeader)) {
+    if (static_cast<size_t>(length) < sizeof(SpoofDataHeader)) {
         status = U_INVALID_FORMAT_ERROR;
         return;
     }
@@ -688,13 +688,13 @@ void SpoofData::initPtrs(UErrorCode &status) {
         return;
     }
     if (fRawData->fCFUKeys != 0) {
-        fCFUKeys = (int32_t *)((char *)fRawData + fRawData->fCFUKeys);
+        fCFUKeys = reinterpret_cast<int32_t*>(reinterpret_cast<char*>(fRawData) + fRawData->fCFUKeys);
     }
     if (fRawData->fCFUStringIndex != 0) {
-        fCFUValues = (uint16_t *)((char *)fRawData + fRawData->fCFUStringIndex);
+        fCFUValues = reinterpret_cast<uint16_t*>(reinterpret_cast<char*>(fRawData) + fRawData->fCFUStringIndex);
     }
     if (fRawData->fCFUStringTable != 0) {
-        fCFUStrings = (char16_t *)((char *)fRawData + fRawData->fCFUStringTable);
+        fCFUStrings = reinterpret_cast<char16_t*>(reinterpret_cast<char*>(fRawData) + fRawData->fCFUStringTable);
     }
 }
 
@@ -739,7 +739,7 @@ void *SpoofData::reserveSpace(int32_t numBytes,  UErrorCode &status) {
     fRawData->fLength = fMemLimit;
     uprv_memset((char *)fRawData + returnOffset, 0, numBytes);
     initPtrs(status);
-    return (char *)fRawData + returnOffset;
+    return reinterpret_cast<char*>(fRawData) + returnOffset;
 }
 
 int32_t SpoofData::serialize(void *buf, int32_t capacity, UErrorCode &status) const {
@@ -806,7 +806,7 @@ int32_t SpoofData::appendValueTo(int32_t index, UnicodeString& dest) const {
     // an index into the string table (for longer strings)
     uint16_t value = fCFUValues[index];
     if (stringLength == 1) {
-        dest.append((char16_t)value);
+        dest.append(static_cast<char16_t>(value));
     } else {
         dest.append(fCFUStrings + value, stringLength);
     }