aboutsummaryrefslogtreecommitdiff
path: root/src/core/ext/filters
diff options
context:
space:
mode:
authorncteisen <ncteisen@gmail.com>2018-07-27 02:11:55 -0700
committerncteisen <ncteisen@gmail.com>2018-07-27 02:11:55 -0700
commit012ddf15efb51e9b592c7cde6d3ba60aa685e818 (patch)
treef671b7f4b982913c80accd8da04e6d2ecaa029de /src/core/ext/filters
parent1f533d2ae562f6664e707c0390629b40b0fb1957 (diff)
parent78aca7bf85fee5eb9c47b430ce20452cec1faf2d (diff)
downloadgrpc-grpc-012ddf15efb51e9b592c7cde6d3ba60aa685e818.tar.gz
Merge branch 'ref_counted_ptr_polymorphism_fix' of https://github.com/markdroth/grpc into channelz-subchannels
Diffstat (limited to 'src/core/ext/filters')
-rw-r--r--src/core/ext/filters/client_channel/client_channel_channelz.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ext/filters/client_channel/client_channel_channelz.cc b/src/core/ext/filters/client_channel/client_channel_channelz.cc
index b209acc2ea..f797ef1b09 100644
--- a/src/core/ext/filters/client_channel/client_channel_channelz.cc
+++ b/src/core/ext/filters/client_channel/client_channel_channelz.cc
@@ -142,8 +142,8 @@ grpc_arg ClientChannelNode::CreateChannelArg() {
RefCountedPtr<ChannelNode> ClientChannelNode::MakeClientChannelNode(
grpc_channel* channel, size_t channel_tracer_max_nodes,
bool is_top_level_channel) {
- return MakePolymorphicRefCounted<ChannelNode, ClientChannelNode>(
- channel, channel_tracer_max_nodes, is_top_level_channel);
+ return MakeRefCounted<ClientChannelNode>(channel, channel_tracer_max_nodes,
+ is_top_level_channel);
}
SubchannelNode::SubchannelNode(grpc_subchannel* subchannel,