diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-16 01:31:06 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-16 01:31:06 +0000 |
| commit | e9b9e702bdc39af4b3e29f01bc7018b52a8ba040 (patch) | |
| tree | d01619abd0f5f655c11e9b513cd0448f8b9e9d7e | |
| parent | ded89a85c6af0a11ec10985ebd15f84e620ed72e (diff) | |
| parent | 64ab72649a2e7aeb440c12cff8480c4db61bde8c (diff) | |
| download | keymaster-e9b9e702bdc39af4b3e29f01bc7018b52a8ba040.tar.gz | |
Snap for 9753828 from 64ab72649a2e7aeb440c12cff8480c4db61bde8c to udc-d1-release
Change-Id: I3ab0541693abbe20da405e723724bae760e2b21b
| -rw-r--r-- | include/keymaster/keymaster_tags.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/keymaster/keymaster_tags.h b/include/keymaster/keymaster_tags.h index e8188e8..29eae7c 100644 --- a/include/keymaster/keymaster_tags.h +++ b/include/keymaster/keymaster_tags.h @@ -108,7 +108,7 @@ template <keymaster_tag_type_t tag_type, keymaster_tag_t tag> class TypedTag { // NOLINTNEXTLINE(google-explicit-constructor) inline operator keymaster_tag_t() { return tag; } // NOLINTNEXTLINE(google-runtime-int) - inline long masked_tag() { return static_cast<long>(keymaster_tag_mask_type(tag)); } + inline int masked_tag() { return static_cast<int>(keymaster_tag_mask_type(tag)); } }; template <keymaster_tag_type_t tag_type, keymaster_tag_t tag, typename KeymasterEnum> @@ -126,7 +126,7 @@ class TypedEnumTag { // NOLINTNEXTLINE(google-explicit-constructor) inline operator keymaster_tag_t() { return tag; } // NOLINTNEXTLINE(google-runtime-int) - inline long masked_tag() { return static_cast<long>(keymaster_tag_mask_type(tag)); } + inline int masked_tag() { return static_cast<int>(keymaster_tag_mask_type(tag)); } }; #ifdef KEYMASTER_NAME_TAGS |