fix: build with clang11 in centos7

billowqiu · Mar 24, 2024 · 6e5c2c6 · 6e5c2c6
1 parent 96701cb
commit 6e5c2c6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -23,7 +23,7 @@ CdsApiHelper::onConfigUpdate(const std::vector<Config::DecodedResourceRef>& adde
     const auto eds_type_url =
         Config::getTypeUrl<envoy::config::endpoint::v3::ClusterLoadAssignment>();
     const auto leds_type_url = Config::getTypeUrl<envoy::config::endpoint::v3::LbEndpoint>();
-    maybe_resume_eds_leds = cm_.adsMux()->pause({eds_type_url, leds_type_url});
+    maybe_resume_eds_leds = cm_.adsMux()->pause(std::vector<std::string>{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
@@ -187,7 +187,7 @@ void ClusterManagerInitHelper::maybeFinishInitialize() {
         const auto eds_type_url =
             Config::getTypeUrl<envoy::config::endpoint::v3::ClusterLoadAssignment>();
         const auto leds_type_url = Config::getTypeUrl<envoy::config::endpoint::v3::LbEndpoint>();
-        maybe_resume_eds_leds = cm_.adsMux()->pause({eds_type_url, leds_type_url});
+        maybe_resume_eds_leds = cm_.adsMux()->pause(std::vector<std::string>{eds_type_url, leds_type_url});
       }
       initializeSecondaryClusters();
     }