Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a574ede2 authored by Yi Kong's avatar Yi Kong Committed by android-build-merger
Browse files

Merge "Suppress null-dereference warning" am: 3b7ecd55 am: 86f9078b 

am: 1633275b

Change-Id: I43f5feaf279921c4dc0adc98afc9c5f528c01fcc
parents 687cb738 1633275b

keymaster/3.0/vts/functional/keymaster_tags.h

+3 −0
Original line number Diff line number Diff line
@@ -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; }

keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h

+3 −0
Original line number Diff line number Diff line
@@ -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 {