diff options
| author | Yi Kong <yikong@google.com> | 2019-01-08 20:33:47 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-08 20:33:47 -0800 |
| commit | a574ede20b05ff67fe36f6e3e7702a8b2e4067fc (patch) | |
| tree | 335f55fc5952e9800932818823dc198af29c4dc4 /keymaster | |
| parent | 687cb738352afbb874ef6b11656b429a68b9d9b0 (diff) | |
| parent | 1633275bb71e9500d2b6e544d0d58a7493fcfb9a (diff) | |
| download | android_hardware_interfaces-a574ede20b05ff67fe36f6e3e7702a8b2e4067fc.tar.gz android_hardware_interfaces-a574ede20b05ff67fe36f6e3e7702a8b2e4067fc.tar.bz2 android_hardware_interfaces-a574ede20b05ff67fe36f6e3e7702a8b2e4067fc.zip | |
Merge "Suppress null-dereference warning" am: 3b7ecd55f8 am: 86f9078b54
am: 1633275bb7
Change-Id: I43f5feaf279921c4dc0adc98afc9c5f528c01fcc
Diffstat (limited to 'keymaster')
| -rw-r--r-- | keymaster/3.0/vts/functional/keymaster_tags.h | 3 | ||||
| -rw-r--r-- | keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/keymaster/3.0/vts/functional/keymaster_tags.h b/keymaster/3.0/vts/functional/keymaster_tags.h index f241ef160..8544bf7dd 100644 --- a/keymaster/3.0/vts/functional/keymaster_tags.h +++ b/keymaster/3.0/vts/functional/keymaster_tags.h @@ -274,7 +274,10 @@ inline KeyParameter Authorization(TypedTag<tag_type, tag> ttag, Args&&... args) */ template <typename ValueT> class NullOr { template <typename T> struct reference_initializer { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wnull-dereference" static T&& init() { return *static_cast<std::remove_reference_t<T>*>(nullptr); } +#pragma GCC diagnostic pop }; template <typename T> struct pointer_initializer { static T init() { return nullptr; } diff --git a/keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h b/keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h index 61c444c16..97dab6821 100644 --- a/keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h +++ b/keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h @@ -282,7 +282,10 @@ template <typename ValueT> class NullOr { template <typename T> struct reference_initializer { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wnull-dereference" static T&& init() { return *static_cast<std::remove_reference_t<T>*>(nullptr); } +#pragma GCC diagnostic pop }; template <typename T> struct pointer_initializer { |