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

Commit c5201382 authored by Aditya Kumar's avatar Aditya Kumar Committed by Automerger Merge Worker
Browse files

Merge "Fix visitor" into main am: 004bccd9 am: d83c544d am: fe9a892a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2800293



Change-Id: Ic8b367a90faa2c13bf8fae1302dfb97a8db3fc6c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 32a061e2 fe9a892a

services/inputflinger/InputListener.cpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ std::list<NotifyArgs>& operator+=(std::list<NotifyArgs>& keep, std::list<NotifyA 


// Helper to std::visit with lambdas.

template <typename... V>

struct Visitor : V... {};

struct Visitor : V... { using V::operator()...; };

// explicit deduction guide (not needed as of C++20)

template <typename... V>

Visitor(V...) -> Visitor<V...>;

services/inputflinger/NotifyArgs.cpp

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ NotifyPointerCaptureChangedArgs::NotifyPointerCaptureChangedArgs( 


// Helper to std::visit with lambdas.

template <typename... V>

struct Visitor : V... {};

struct Visitor : V... { using V::operator()...; };

// explicit deduction guide (not needed as of C++20)

template <typename... V>

Visitor(V...) -> Visitor<V...>;

services/inputflinger/reader/mapper/gestures/PropertyProvider.cpp

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ namespace { 


// Helper to std::visit with lambdas.

template <typename... V>

struct Visitor : V... {};

struct Visitor : V... { using V::operator()...; };

// explicit deduction guide (not needed as of C++20)

template <typename... V>

Visitor(V...) -> Visitor<V...>;