Use fixed-size types for Objective C enums/options. (#16264)

This makes 64-bit cases work much better.
project-chip · Mar 24, 2022 · 1224336 · 1224336
1 parent 47d823d
commit 1224336
Show file tree

Hide file tree

Showing 2 changed files with 185 additions and 185 deletions.
diff --git a/src/darwin/Framework/CHIP/templates/CHIPClustersObjc.zapt b/src/darwin/Framework/CHIP/templates/CHIPClustersObjc.zapt
@@ -60,15 +60,15 @@ subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEs
 
 {{#zcl_clusters}}
 {{#zcl_enums}}
-typedef NS_ENUM(NSInteger, {{objCEnumName ../name label}}) {
+typedef NS_ENUM({{asUnderlyingZclType type}}, {{objCEnumName ../name label}}) {
    {{#zcl_enum_items}}
    {{objCEnumName ../../name ../label}}{{objCEnumItemLabel label}} = {{asHex value 2}},
    {{/zcl_enum_items}}
 };
 
 {{/zcl_enums}}
 {{#zcl_bitmaps}}
-typedef NS_OPTIONS(NSUInteger, {{objCEnumName ../name label}}) {
+typedef NS_OPTIONS({{asUnderlyingZclType type}}, {{objCEnumName ../name label}}) {
    {{#zcl_bitmap_items}}
    {{objCEnumName ../../name ../label}}{{objCEnumItemLabel label}} = {{asHex mask}},
    {{/zcl_bitmap_items}}