Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 22:04:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Suppress null-dereference warning" am: 3b7ecd55f8

Browse Source 
am: 86f9078b54

Change-Id: Iff805b933dbddfaae22de3ef34caa8b391dedfe9
This commit is contained in:
Yi Kong
2019-01-08 20:29:44 -08:00
committed by android-build-merger
parent 3bb32db38d 86f9078b54
commit 1633275bb7
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
keymaster/3.0/vts/functional/keymaster_tags.h
View File

@@ -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; }

3
keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h
View File

@@ -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 {