From 0bf979910748a5d45491e9feac4b4fa3b87f4de5 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Wed, 6 Nov 2019 12:06:32 -0800 Subject: [PATCH] Replaced grpc_core::Set with std::set --- BUILD | 1 - BUILD.gn | 2 -- build.yaml | 1 - gRPC-C++.podspec | 1 - gRPC-Core.podspec | 2 -- grpc.gemspec | 1 - package.xml | 1 - .../filters/client_channel/client_channel.cc | 5 +-- .../filters/client_channel/xds/xds_client.h | 5 +-- src/core/lib/gprpp/set.h | 33 ------------------- tools/doxygen/Doxyfile.c++.internal | 1 - tools/doxygen/Doxyfile.core.internal | 1 - 12 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 src/core/lib/gprpp/set.h diff --git a/BUILD b/BUILD index 1bd3b6b9ca9..7cc070e4ba0 100644 --- a/BUILD +++ b/BUILD @@ -535,7 +535,6 @@ grpc_cc_library( "src/core/lib/gprpp/map.h", "src/core/lib/gprpp/memory.h", "src/core/lib/gprpp/mpscq.h", - "src/core/lib/gprpp/set.h", "src/core/lib/gprpp/string_view.h", "src/core/lib/gprpp/sync.h", "src/core/lib/gprpp/thd.h", diff --git a/BUILD.gn b/BUILD.gn index cbcc78156af..80f84b06e18 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -149,7 +149,6 @@ config("grpc_config") { "src/core/lib/gprpp/memory.h", "src/core/lib/gprpp/mpscq.cc", "src/core/lib/gprpp/mpscq.h", - "src/core/lib/gprpp/set.h", "src/core/lib/gprpp/sync.h", "src/core/lib/gprpp/thd.h", "src/core/lib/gprpp/thd_posix.cc", @@ -1250,7 +1249,6 @@ config("grpc_config") { "src/core/lib/gprpp/orphanable.h", "src/core/lib/gprpp/ref_counted.h", "src/core/lib/gprpp/ref_counted_ptr.h", - "src/core/lib/gprpp/set.h", "src/core/lib/gprpp/string_view.h", "src/core/lib/gprpp/sync.h", "src/core/lib/gprpp/thd.h", diff --git a/build.yaml b/build.yaml index c33716e88ae..5a6b6c6398c 100644 --- a/build.yaml +++ b/build.yaml @@ -294,7 +294,6 @@ filegroups: - src/core/lib/gprpp/map.h - src/core/lib/gprpp/memory.h - src/core/lib/gprpp/mpscq.h - - src/core/lib/gprpp/set.h - src/core/lib/gprpp/sync.h - src/core/lib/gprpp/thd.h - src/core/lib/profiling/timers.h diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 6d7059d238d..d0b506e2988 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -337,7 +337,6 @@ Pod::Spec.new do |s| 'src/core/lib/gprpp/orphanable.h', 'src/core/lib/gprpp/ref_counted.h', 'src/core/lib/gprpp/ref_counted_ptr.h', - 'src/core/lib/gprpp/set.h', 'src/core/lib/gprpp/string_view.h', 'src/core/lib/gprpp/sync.h', 'src/core/lib/gprpp/thd.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index eeb6beff9f9..33e4c64d674 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -563,7 +563,6 @@ Pod::Spec.new do |s| 'src/core/lib/gprpp/orphanable.h', 'src/core/lib/gprpp/ref_counted.h', 'src/core/lib/gprpp/ref_counted_ptr.h', - 'src/core/lib/gprpp/set.h', 'src/core/lib/gprpp/string_view.h', 'src/core/lib/gprpp/sync.h', 'src/core/lib/gprpp/thd.h', @@ -1146,7 +1145,6 @@ Pod::Spec.new do |s| 'src/core/lib/gprpp/orphanable.h', 'src/core/lib/gprpp/ref_counted.h', 'src/core/lib/gprpp/ref_counted_ptr.h', - 'src/core/lib/gprpp/set.h', 'src/core/lib/gprpp/string_view.h', 'src/core/lib/gprpp/sync.h', 'src/core/lib/gprpp/thd.h', diff --git a/grpc.gemspec b/grpc.gemspec index bcc49452099..328cb0ca86d 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -108,7 +108,6 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/gprpp/map.h ) s.files += %w( src/core/lib/gprpp/memory.h ) s.files += %w( src/core/lib/gprpp/mpscq.h ) - s.files += %w( src/core/lib/gprpp/set.h ) s.files += %w( src/core/lib/gprpp/sync.h ) s.files += %w( src/core/lib/gprpp/thd.h ) s.files += %w( src/core/lib/profiling/timers.h ) diff --git a/package.xml b/package.xml index fb76344b987..44307eebd03 100644 --- a/package.xml +++ b/package.xml @@ -113,7 +113,6 @@ - diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index ed61537cb03..d5a38d1d3ab 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -26,6 +26,8 @@ #include #include +#include + #include #include #include @@ -53,7 +55,6 @@ #include "src/core/lib/gprpp/inlined_vector.h" #include "src/core/lib/gprpp/manual_constructor.h" #include "src/core/lib/gprpp/map.h" -#include "src/core/lib/gprpp/set.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/iomgr.h" @@ -295,7 +296,7 @@ class ChannelData { // The set of SubchannelWrappers that currently exist. // No need to hold a ref, since the map is updated in the control-plane // combiner when the SubchannelWrappers are created and destroyed. - Set subchannel_wrappers_; + std::set subchannel_wrappers_; // Pending ConnectedSubchannel updates for each SubchannelWrapper. // Updates are queued here in the control plane combiner and then applied // in the data plane mutex when the picker is updated. diff --git a/src/core/ext/filters/client_channel/xds/xds_client.h b/src/core/ext/filters/client_channel/xds/xds_client.h index c5fc08cf0c2..e5c9573ecf6 100644 --- a/src/core/ext/filters/client_channel/xds/xds_client.h +++ b/src/core/ext/filters/client_channel/xds/xds_client.h @@ -19,6 +19,8 @@ #include +#include + #include "src/core/ext/filters/client_channel/service_config.h" #include "src/core/ext/filters/client_channel/xds/xds_api.h" #include "src/core/ext/filters/client_channel/xds/xds_bootstrap.h" @@ -28,7 +30,6 @@ #include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" -#include "src/core/lib/gprpp/set.h" #include "src/core/lib/gprpp/string_view.h" #include "src/core/lib/iomgr/combiner.h" @@ -175,7 +176,7 @@ class XdsClient : public InternallyRefCounted { cluster_watchers; Map> endpoint_watchers; - Set client_stats; + std::set client_stats; // The latest data seen from EDS. EdsUpdate eds_update; }; diff --git a/src/core/lib/gprpp/set.h b/src/core/lib/gprpp/set.h deleted file mode 100644 index 89535929c3c..00000000000 --- a/src/core/lib/gprpp/set.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// Copyright 2017 gRPC authors. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -#ifndef GRPC_CORE_LIB_GPRPP_SET_H -#define GRPC_CORE_LIB_GPRPP_SET_H - -#include - -#include - -#include "src/core/lib/gprpp/memory.h" - -namespace grpc_core { - -template > -using Set = std::set>; - -} // namespace grpc_core - -#endif /* GRPC_CORE_LIB_GPRPP_SET_H */ diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 64476e2979e..a06856c8fbe 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -1121,7 +1121,6 @@ src/core/lib/gprpp/optional.h \ src/core/lib/gprpp/orphanable.h \ src/core/lib/gprpp/ref_counted.h \ src/core/lib/gprpp/ref_counted_ptr.h \ -src/core/lib/gprpp/set.h \ src/core/lib/gprpp/string_view.h \ src/core/lib/gprpp/sync.h \ src/core/lib/gprpp/thd.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index f65a17c328a..1b0ff5c5698 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1264,7 +1264,6 @@ src/core/lib/gprpp/optional.h \ src/core/lib/gprpp/orphanable.h \ src/core/lib/gprpp/ref_counted.h \ src/core/lib/gprpp/ref_counted_ptr.h \ -src/core/lib/gprpp/set.h \ src/core/lib/gprpp/string_view.h \ src/core/lib/gprpp/sync.h \ src/core/lib/gprpp/thd.h \