From 6fd332c4f42a895f7e82f02746f59228584d1a08 Mon Sep 17 00:00:00 2001 From: XieHan Date: Thu, 18 Aug 2022 16:54:15 +0800 Subject: [PATCH] Fixed C++ out-of-order designated initialization on MacOS with gcc --- src/factory/DnsTaskImpl.cc | 7 +------ src/nameservice/WFDnsResolver.cc | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/factory/DnsTaskImpl.cc b/src/factory/DnsTaskImpl.cc index db97ab54..842ae3dc 100644 --- a/src/factory/DnsTaskImpl.cc +++ b/src/factory/DnsTaskImpl.cc @@ -52,12 +52,7 @@ struct addrinfo ComplexDnsTask::hints = { .ai_flags = AI_NUMERICSERV | AI_NUMERICHOST, .ai_family = AF_UNSPEC, - .ai_socktype = SOCK_STREAM, - .ai_protocol = 0, - .ai_addrlen = 0, - .ai_addr = NULL, - .ai_canonname = NULL, - .ai_next = NULL + .ai_socktype = SOCK_STREAM }; CommMessageOut *ComplexDnsTask::message_out() diff --git a/src/nameservice/WFDnsResolver.cc b/src/nameservice/WFDnsResolver.cc index a664e0d5..60ac3ec2 100644 --- a/src/nameservice/WFDnsResolver.cc +++ b/src/nameservice/WFDnsResolver.cc @@ -56,12 +56,7 @@ static constexpr struct addrinfo __ai_hints = .ai_flags = 0, #endif .ai_family = AF_UNSPEC, - .ai_socktype = SOCK_STREAM, - .ai_protocol = 0, - .ai_addrlen = 0, - .ai_addr = NULL, - .ai_canonname = NULL, - .ai_next = NULL + .ai_socktype = SOCK_STREAM }; struct DnsContext