From 6e5c2c69d647927a68877ca3d76425eb5e433966 Mon Sep 17 00:00:00 2001 From: billowqiu Date: Sun, 24 Mar 2024 14:15:53 +0800 Subject: [PATCH] fix: build with clang11 in centos7 --- bazel/envoy_internal.bzl | 1 - source/common/upstream/cds_api_helper.cc | 2 +- source/common/upstream/cluster_manager_impl.cc | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bazel/envoy_internal.bzl b/bazel/envoy_internal.bzl index 9c5130f15e4b..27a65c087f1d 100644 --- a/bazel/envoy_internal.bzl +++ b/bazel/envoy_internal.bzl @@ -7,7 +7,6 @@ def envoy_copts(repository, test = False): posix_options = [ "-Wall", "-Wextra", - "-Werror", "-Wnon-virtual-dtor", "-Woverloaded-virtual", "-Wold-style-cast", diff --git a/source/common/upstream/cds_api_helper.cc b/source/common/upstream/cds_api_helper.cc index 4511391f645a..85961fbb5067 100644 --- a/source/common/upstream/cds_api_helper.cc +++ b/source/common/upstream/cds_api_helper.cc @@ -23,7 +23,7 @@ CdsApiHelper::onConfigUpdate(const std::vector& adde const auto eds_type_url = Config::getTypeUrl(); const auto leds_type_url = Config::getTypeUrl(); - maybe_resume_eds_leds = cm_.adsMux()->pause({eds_type_url, leds_type_url}); + maybe_resume_eds_leds = cm_.adsMux()->pause(std::vector{eds_type_url, leds_type_url}); } ENVOY_LOG(info, "{}: add {} cluster(s), remove {} cluster(s)", name_, added_resources.size(), diff --git a/source/common/upstream/cluster_manager_impl.cc b/source/common/upstream/cluster_manager_impl.cc index 31913283e2d4..21970c5d4998 100644 --- a/source/common/upstream/cluster_manager_impl.cc +++ b/source/common/upstream/cluster_manager_impl.cc @@ -187,7 +187,7 @@ void ClusterManagerInitHelper::maybeFinishInitialize() { const auto eds_type_url = Config::getTypeUrl(); const auto leds_type_url = Config::getTypeUrl(); - maybe_resume_eds_leds = cm_.adsMux()->pause({eds_type_url, leds_type_url}); + maybe_resume_eds_leds = cm_.adsMux()->pause(std::vector{eds_type_url, leds_type_url}); } initializeSecondaryClusters(); }