diff options
| author |  David Garcia Quintas <dgq@google.com> | 2018-01-09 19:27:46 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2018-01-09 19:39:13 -0800 |
| commit | 70fbe6261376f5e0bf7a9c62f3809730d8c93e3c (patch) | |
| tree | 99108968a0b2d0cc0ceacda7ac89bd1e97c11610 /src/core/ext/filters/client_channel/subchannel.h | |
| parent | baf1ac7af91eab2da6024b05ddb83720d9644b94 (diff) | |
| parent | 0ea629c61ec70a35075e800bc3f85651f00e746f (diff) | |
Merge branch 'master' of github.com:grpc/grpc into conn_subchannel
Diffstat (limited to 'src/core/ext/filters/client_channel/subchannel.h')
| -rw-r--r-- | src/core/ext/filters/client_channel/subchannel.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/core/ext/filters/client_channel/subchannel.h b/src/core/ext/filters/client_channel/subchannel.h index dbc5742787..61fa97a21a 100644 --- a/src/core/ext/filters/client_channel/subchannel.h +++ b/src/core/ext/filters/client_channel/subchannel.h @@ -49,9 +49,9 @@ typedef struct grpc_subchannel_key grpc_subchannel_key; #define GRPC_SUBCHANNEL_WEAK_UNREF(p, r) \ grpc_subchannel_weak_unref((p), __FILE__, __LINE__, (r)) #define GRPC_CONNECTED_SUBCHANNEL_REF(p, r) \ - ConnectedSubchannel_ref((p), __FILE__, __LINE__, (r)) + grpc_connected_subchannel_ref((p), __FILE__, __LINE__, (r)) #define GRPC_CONNECTED_SUBCHANNEL_UNREF(p, r) \ - ConnectedSubchannel_unref((p), __FILE__, __LINE__, (r)) + grpc_connected_subchannel_unref((p), __FILE__, __LINE__, (r)) #define GRPC_SUBCHANNEL_CALL_REF(p, r) \ grpc_subchannel_call_ref((p), __FILE__, __LINE__, (r)) #define GRPC_SUBCHANNEL_CALL_UNREF(p, r) \ @@ -65,8 +65,9 @@ typedef struct grpc_subchannel_key grpc_subchannel_key; #define GRPC_SUBCHANNEL_UNREF(p, r) grpc_subchannel_unref((p)) #define GRPC_SUBCHANNEL_WEAK_REF(p, r) grpc_subchannel_weak_ref((p)) #define GRPC_SUBCHANNEL_WEAK_UNREF(p, r) grpc_subchannel_weak_unref((p)) -#define GRPC_CONNECTED_SUBCHANNEL_REF(p, r) ConnectedSubchannel_ref((p)) -#define GRPC_CONNECTED_SUBCHANNEL_UNREF(p, r) ConnectedSubchannel_unref((p)) +#define GRPC_CONNECTED_SUBCHANNEL_REF(p, r) grpc_connected_subchannel_ref((p)) +#define GRPC_CONNECTED_SUBCHANNEL_UNREF(p, r) \ + grpc_connected_subchannel_unref((p)) #define GRPC_SUBCHANNEL_CALL_REF(p, r) grpc_subchannel_call_ref((p)) #define GRPC_SUBCHANNEL_CALL_UNREF(p, r) grpc_subchannel_call_unref((p)) #define GRPC_SUBCHANNEL_REF_EXTRA_ARGS @@ -110,9 +111,9 @@ grpc_subchannel* grpc_subchannel_weak_ref( grpc_subchannel* channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); void grpc_subchannel_weak_unref( grpc_subchannel* channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -grpc_core::ConnectedSubchannel* ConnectedSubchannel_ref( +grpc_core::ConnectedSubchannel* grpc_connected_subchannel_ref( grpc_core::ConnectedSubchannel* channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); -void ConnectedSubchannel_unref( +void grpc_connected_subchannel_unref( grpc_core::ConnectedSubchannel* channel GRPC_SUBCHANNEL_REF_EXTRA_ARGS); void grpc_subchannel_call_ref( grpc_subchannel_call* call GRPC_SUBCHANNEL_REF_EXTRA_ARGS); |