From 8cb3c9b3265686cf8c47beb27e7aa99e0d4f0729 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Tue, 5 Nov 2019 14:56:57 -0800 Subject: [PATCH] [hardware][interfaces][sensors] fix -Wreorder-init-list C++20 will require members in a designated initializer to be in order unlike C99. Bug: 139945549 Test: mm Merged-In: I78d64ea2b7df3f2bd3b8503aa553a0523b20d711 Change-Id: I8a7ff4b025ac693398b79ad5f16687afe3a4c5a9 Signed-off-by: Nick Desaulniers --- sensors/1.0/default/convert.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sensors/1.0/default/convert.cpp b/sensors/1.0/default/convert.cpp index 52f5e4f5a0..53ceb0d92f 100644 --- a/sensors/1.0/default/convert.cpp +++ b/sensors/1.0/default/convert.cpp @@ -68,9 +68,9 @@ void convertFromSensorEvent(const sensors_event_t &src, Event *dst) { typedef ::android::hardware::sensors::V1_0::MetaDataEventType MetaDataEventType; *dst = { - .sensorHandle = src.sensor, - .sensorType = (SensorType)src.type, - .timestamp = src.timestamp + .timestamp = src.timestamp, + .sensorHandle = src.sensor, + .sensorType = (SensorType)src.type, }; switch (dst->sensorType) {