From af77dc4014ead3d898fdc8a7a70fe5063ac9b102 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Fri, 25 Oct 2019 19:01:29 +0000 Subject: [PATCH] GCC: use brace-initializer for DohUpgrade vector Constructing NoDestructor with parenthesis constructor is ambiguous in GCC. Use brace-initializer to avoid that problem. This fixes this build error: Bug: 819294 Change-Id: I00dda42daa1794d11e022f26ac07f92e599d106d Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879910 Reviewed-by: Eric Orth Commit-Queue: José Dapena Paz Cr-Commit-Position: refs/heads/master@{#709569} --- diff --git a/net/dns/dns_util.cc b/net/dns/dns_util.cc index 14997c4..637b6f2 100644 --- a/net/dns/dns_util.cc +++ b/net/dns/dns_util.cc @@ -144,7 +144,7 @@ // DohProviderId histogram suffix list in // tools/metrics/histograms/histograms.xml. static const base::NoDestructor> - upgradable_servers({ + upgradable_servers{{ DohUpgradeEntry( "CleanBrowsingAdult", {"185.228.168.10", "185.228.169.11", "2a0d:2a00:1::1", @@ -215,7 +215,7 @@ {"9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9"}, {"dns.quad9.net", "dns9.quad9.net"} /* DoT hostname */, {"https://dns.quad9.net/dns-query", true /* use_post */}), - }); + }}; return *upgradable_servers; }