ICU-23136 U_I18N_API_CLASS to exclude Locale fields

markusicu · markusicu · commit 2e4f999b48f0 · 2025-07-18T14:35:26.000-07:00
diff --git a/icu4c/source/i18n/collationtailoring.h b/icu4c/source/i18n/collationtailoring.h
@@ -49,20 +49,20 @@ class UnicodeSet;
  *
  * U_I18N_API because genuca & genrb use it.
  */
-struct U_I18N_API CollationTailoring : public SharedObject {
-    CollationTailoring(const CollationSettings *baseSettings);
-    virtual ~CollationTailoring();
+struct U_I18N_API_CLASS CollationTailoring : public SharedObject {
+    U_I18N_API CollationTailoring(const CollationSettings *baseSettings);
+    U_I18N_API virtual ~CollationTailoring();
 
     /**
      * Returns true if the constructor could not initialize properly.
      */
-    UBool isBogus() { return settings == nullptr; }
+    U_I18N_API UBool isBogus() { return settings == nullptr; }
 
-    UBool ensureOwnedData(UErrorCode &errorCode);
+    U_I18N_API UBool ensureOwnedData(UErrorCode &errorCode);
 
-    static void makeBaseVersion(const UVersionInfo ucaVersion, UVersionInfo version);
-    void setVersion(const UVersionInfo baseVersion, const UVersionInfo rulesVersion);
-    int32_t getUCAVersion() const;
+    U_I18N_API static void makeBaseVersion(const UVersionInfo ucaVersion, UVersionInfo version);
+    U_I18N_API void setVersion(const UVersionInfo baseVersion, const UVersionInfo rulesVersion);
+    U_I18N_API int32_t getUCAVersion() const;
 
     // data for sorting etc.
     const CollationData *data;  // == base data or ownedData
@@ -97,14 +97,14 @@ struct U_I18N_API CollationTailoring : public SharedObject {
 };
 
 // U_I18N_API because gencolusb uses it.
-struct U_I18N_API CollationCacheEntry : public SharedObject {
-    CollationCacheEntry(const Locale &loc, const CollationTailoring *t)
+struct U_I18N_API_CLASS CollationCacheEntry : public SharedObject {
+    U_I18N_API CollationCacheEntry(const Locale &loc, const CollationTailoring *t)
             : validLocale(loc), tailoring(t) {
         if(t != nullptr) {
             t->addRef();
         }
     }
-    ~CollationCacheEntry();
+    U_I18N_API ~CollationCacheEntry();
 
     Locale validLocale;
     const CollationTailoring *tailoring;
diff --git a/icu4c/source/i18n/unicode/numberformatter.h b/icu4c/source/i18n/unicode/numberformatter.h
@@ -1520,7 +1520,7 @@ class U_I18N_API Padder : public UMemory {
 // Do not enclose entire MacroProps with #ifndef U_HIDE_INTERNAL_API, needed for a protected field.
 // U_I18N_API because intltest uses it.
 /** @internal */
-struct U_I18N_API MacroProps : public UMemory {
+struct U_I18N_API_CLASS MacroProps : public UMemory {
     /** @internal */
     Notation notation;
 
@@ -1589,7 +1589,7 @@ struct U_I18N_API MacroProps : public UMemory {
      * Check all members for errors.
      * @internal
      */
-    bool copyErrorTo(UErrorCode &status) const {
+    U_I18N_API bool copyErrorTo(UErrorCode &status) const {
         return notation.copyErrorTo(status) || precision.copyErrorTo(status) ||
                padder.copyErrorTo(status) || integerWidth.copyErrorTo(status) ||
                symbols.copyErrorTo(status) || scale.copyErrorTo(status) || usage.copyErrorTo(status) ||
