diff options
author | Bill Feng <yfen@google.com> | 2018-11-26 10:15:47 -0800 |
---|---|---|
committer | Bill Feng <yfen@google.com> | 2018-11-26 10:15:47 -0800 |
commit | 5810b53df3e4ef338f610a71d4a8443f665a2bc6 (patch) | |
tree | 042d29b30e427615928c6fb3e4118112ea626276 /test/core/util/mock_endpoint.cc | |
parent | 70f9992d77e67f90234b079eabaa33210d866c87 (diff) | |
parent | 5ee0cdc4222a137024598579107f51767062efc2 (diff) |
merge conflict fix
Diffstat (limited to 'test/core/util/mock_endpoint.cc')
-rw-r--r-- | test/core/util/mock_endpoint.cc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/test/core/util/mock_endpoint.cc b/test/core/util/mock_endpoint.cc index ef6fd62b51..e5867cd526 100644 --- a/test/core/util/mock_endpoint.cc +++ b/test/core/util/mock_endpoint.cc @@ -103,18 +103,19 @@ static grpc_resource_user* me_get_resource_user(grpc_endpoint* ep) { static int me_get_fd(grpc_endpoint* ep) { return -1; } -static const grpc_endpoint_vtable vtable = { - me_read, - me_write, - me_add_to_pollset, - me_add_to_pollset_set, - me_delete_from_pollset_set, - me_shutdown, - me_destroy, - me_get_resource_user, - me_get_peer, - me_get_fd, -}; +static bool me_can_track_err(grpc_endpoint* ep) { return false; } + +static const grpc_endpoint_vtable vtable = {me_read, + me_write, + me_add_to_pollset, + me_add_to_pollset_set, + me_delete_from_pollset_set, + me_shutdown, + me_destroy, + me_get_resource_user, + me_get_peer, + me_get_fd, + me_can_track_err}; grpc_endpoint* grpc_mock_endpoint_create(void (*on_write)(grpc_slice slice), grpc_resource_quota* resource_quota) { |