diff options
author | 2017-01-11 13:13:23 -0800 | |
---|---|---|
committer | 2017-01-11 13:13:23 -0800 | |
commit | 8a7a4462b1e967661f0eb8a348eef8536dd6e2e9 (patch) | |
tree | f1c07c3481461ad0db4068d3ada87905168b3472 /include/grpc++/support/channel_arguments.h | |
parent | 26d20a8016feaeb0a2fe182505ee60960fb03275 (diff) | |
parent | 3c42128a350f4e153cd3f098fa6b928addb99c58 (diff) |
merge with head
Diffstat (limited to 'include/grpc++/support/channel_arguments.h')
-rw-r--r-- | include/grpc++/support/channel_arguments.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/grpc++/support/channel_arguments.h b/include/grpc++/support/channel_arguments.h index 571ab5d530..d43f7c61bd 100644 --- a/include/grpc++/support/channel_arguments.h +++ b/include/grpc++/support/channel_arguments.h @@ -127,7 +127,7 @@ class ChannelArguments { /// Default pointer argument operations. struct PointerVtableMembers { static void* Copy(void* in) { return in; } - static void Destroy(void* in) {} + static void Destroy(grpc_exec_ctx* exec_ctx, void* in) {} static int Compare(void* a, void* b) { if (a < b) return -1; if (a > b) return 1; |