diff options
| author | Nick Desaulniers <ndesaulniers@google.com> | 2019-10-11 13:40:54 -0700 |
|---|---|---|
| committer | Bruno Martins <bgcngm@gmail.com> | 2021-01-05 16:04:53 +0100 |
| commit | 315d2841f5688efd7d7e5c4ed01f3fadbb615bcb (patch) | |
| tree | a344faca97a001f8cb2de01803d6e4abfc173ffb | |
| parent | 742a5342baa4ef307578e594cdb0cc735ba65fbf (diff) | |
gnss: fix -Wreorder-init-list
C++20 will require members in a designated initializer to be in order
unlike C99.
Bug: 139945549
Test: mm
Change-Id: Ifdccde48c47c0495467f438002caf91cfdbd8091
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
| -rw-r--r-- | gnss/1.0-legacy/Gnss.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/gnss/1.0-legacy/Gnss.cpp b/gnss/1.0-legacy/Gnss.cpp index 5bc6d80..5baae78 100644 --- a/gnss/1.0-legacy/Gnss.cpp +++ b/gnss/1.0-legacy/Gnss.cpp @@ -128,20 +128,20 @@ void Gnss::gnssSvStatusCb(GnssSvStatus* status) { for (size_t i = 0; i < svStatus.numSvs; i++) { auto svInfo = status->gnss_sv_list[i]; IGnssCallback::GnssSvInfo gnssSvInfo = { - .svid = svInfo.svid, - .constellation = static_cast< - android::hardware::gnss::V1_0::GnssConstellationType>( - svInfo.constellation), - .cN0Dbhz = svInfo.c_n0_dbhz, - .elevationDegrees = svInfo.elevation, - .azimuthDegrees = svInfo.azimuth, - // Older chipsets do not provide carrier frequency, hence - // HAS_CARRIER_FREQUENCY flag and the carrierFrequencyHz fields - // are not set. So we are resetting both fields here. - .svFlag = static_cast<uint8_t>( - svInfo.flags &= ~(static_cast<uint8_t>( - IGnssCallback::GnssSvFlags::HAS_CARRIER_FREQUENCY))), - .carrierFrequencyHz = 0}; + .svid = svInfo.svid, + .constellation = static_cast<android::hardware::gnss::V1_0::GnssConstellationType>( + svInfo.constellation), + .cN0Dbhz = svInfo.c_n0_dbhz, + .elevationDegrees = svInfo.elevation, + .azimuthDegrees = svInfo.azimuth, + .carrierFrequencyHz = 0, + // Older chipsets do not provide carrier frequency, hence + // HAS_CARRIER_FREQUENCY flag and the carrierFrequencyHz fields + // are not set. So we are resetting both fields here. + .svFlag = static_cast<uint8_t>( + svInfo.flags &= + ~(static_cast<uint8_t>(IGnssCallback::GnssSvFlags::HAS_CARRIER_FREQUENCY))), + }; svStatus.gnssSvList[i] = gnssSvInfo; } |