commit 6b35750fd5fe0066460c322374576b9c25ee967e
author Nick Desaulniers <ndesaulniers@google.com> Fri Oct 11 09:26:44 2019 -0700
committer Nick Desaulniers <ndesaulniers@google.com> Fri Oct 11 09:28:14 2019 -0700
tree d1ee378faec7fb65e7fd535f45ecb6a91442726c
parent 485a477dfe5ad0cbfea17c9f94b01364237a0732

[netd] 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: I4b856942f5c323898cf572dc60622d62c6ffed94
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>

server/SockDiagTest.cpp

diff --git a/server/SockDiagTest.cpp b/server/SockDiagTest.cpp
index 312f2c8..b79471a 100644
--- a/server/SockDiagTest.cpp
+++ b/server/SockDiagTest.cpp
@@ -199,14 +199,15 @@
 
 inet_diag_msg makeDiagMessage(__u8 family,  const sockaddr *src, const sockaddr *dst) {
     inet_diag_msg msg = {
-        .idiag_family = family,
-        .idiag_state = TCP_ESTABLISHED,
-        .idiag_uid = AID_APP + 123,
-        .idiag_inode = 123456789,
-        .id = {
-            .idiag_sport = 1234,
-            .idiag_dport = 4321,
-        }
+            .idiag_family = family,
+            .idiag_state = TCP_ESTABLISHED,
+            .id =
+                    {
+                            .idiag_sport = 1234,
+                            .idiag_dport = 4321,
+                    },
+            .idiag_uid = AID_APP + 123,
+            .idiag_inode = 123456789,
     };
     EXPECT_TRUE(fillDiagAddr(msg.id.idiag_src, src));
     EXPECT_TRUE(fillDiagAddr(msg.id.idiag_dst, dst));