diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-03-15 19:56:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-03-15 19:56:55 +0000 |
| commit | 4d768643e929c56ea7578c154b24bbe463fc9f46 (patch) | |
| tree | 08d227e3b1c7ef976133211beec46c34384edfe3 | |
| parent | c6413703702c50c05d5402f6684b92b83164ee84 (diff) | |
| parent | 8f4fe24929feda77826880d8a2deacd7fc9b95ac (diff) | |
| download | keymaster-4d768643e929c56ea7578c154b24bbe463fc9f46.tar.gz | |
Merge "Change masked_tag() return type to match BoringSSL change."
| -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 |