diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-07 00:22:50 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-07 00:22:50 +0000 |
| commit | 6a40591965916f86df1b5f8e16c4af3236c27ce7 (patch) | |
| tree | 5586ac54ef1ff41f0d48c97c1a7c21702b92a705 | |
| parent | b7a1097659e6f893dcb844cfe62deceb9417dfbf (diff) | |
| parent | 335eb0b3561b13b70a563bcd64f5dd3862707aef (diff) | |
| download | keymaster-android14-qpr2-s1-release.tar.gz | |
Snap for 11186783 from 335eb0b3561b13b70a563bcd64f5dd3862707aef to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
Change-Id: I1339ec5af128898bb0e8fba3d1f48aeb410d1ae5
| -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 29eae7c..dbd195c 100644 --- a/include/keymaster/keymaster_tags.h +++ b/include/keymaster/keymaster_tags.h @@ -102,7 +102,7 @@ template <keymaster_tag_type_t tag_type, keymaster_tag_t tag> class TypedTag { // Ensure that it's impossible to create a TypedTag instance whose 'tag' doesn't have type // 'tag_type'. Attempting to instantiate a tag with the wrong type will result in a compile // error (no match for template specialization StaticAssert<false>), with no run-time cost. - StaticAssert<(tag & tag_type) == tag_type>::check(); + StaticAssert<(static_cast<keymaster_tag_type_t>(tag) & tag_type) == tag_type>::check(); StaticAssert<(tag_type != KM_ENUM) && (tag_type != KM_ENUM_REP)>::check(); } // NOLINTNEXTLINE(google-explicit-constructor) @@ -120,7 +120,7 @@ class TypedEnumTag { // Ensure that it's impossible to create a TypedTag instance whose 'tag' doesn't have type // 'tag_type'. Attempting to instantiate a tag with the wrong type will result in a compile // error (no match for template specialization StaticAssert<false>), with no run-time cost. - StaticAssert<(tag & tag_type) == tag_type>::check(); + StaticAssert<(static_cast<keymaster_tag_type_t>(tag) & tag_type) == tag_type>::check(); StaticAssert<(tag_type == KM_ENUM) || (tag_type == KM_ENUM_REP)>::check(); } // NOLINTNEXTLINE(google-explicit-constructor) |