diff options
| author | Nick Desaulniers <ndesaulniers@google.com> | 2019-10-11 09:26:44 -0700 |
|---|---|---|
| committer | Nick Desaulniers <ndesaulniers@google.com> | 2019-10-11 09:28:14 -0700 |
| commit | 6b35750fd5fe0066460c322374576b9c25ee967e (patch) | |
| tree | d1ee378faec7fb65e7fd535f45ecb6a91442726c /server/RouteController.cpp | |
| parent | 485a477dfe5ad0cbfea17c9f94b01364237a0732 (diff) | |
| download | netd-6b35750fd5fe0066460c322374576b9c25ee967e.tar.gz | |
[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>
Diffstat (limited to 'server/RouteController.cpp')
| -rw-r--r-- | server/RouteController.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/server/RouteController.cpp b/server/RouteController.cpp index 1abca4b5..a62ed6b5 100644 --- a/server/RouteController.cpp +++ b/server/RouteController.cpp @@ -399,11 +399,11 @@ int modifyIpRoute(uint16_t action, uint32_t table, const char* interface, const // Assemble a rtmsg and put it in an array of iovec structures. rtmsg route = { - .rtm_protocol = RTPROT_STATIC, - .rtm_type = type, - .rtm_family = family, - .rtm_dst_len = prefixLength, - .rtm_scope = static_cast<uint8_t>(nexthop ? RT_SCOPE_UNIVERSE : RT_SCOPE_LINK), + .rtm_family = family, + .rtm_dst_len = prefixLength, + .rtm_protocol = RTPROT_STATIC, + .rtm_scope = static_cast<uint8_t>(nexthop ? RT_SCOPE_UNIVERSE : RT_SCOPE_LINK), + .rtm_type = type, }; rtattr rtaDst = { U16_RTA_LENGTH(rawLength), RTA_DST }; |