diff options
| author |  Yuxuan Li <yuxuanli@google.com> | 2017-03-27 15:47:58 -0700 |
|---|---|---|
| committer | Yuxuan Li <yuxuanli@google.com> | 2017-03-27 15:47:58 -0700 |
| commit | 978c34f6eae3a66ee91113928d9d057aefcc009d (patch) | |
| tree | 069b7b00ae6314548187f5e52a70c7d07ebf3e7a /include/grpc++ | |
| parent | e5ddd4b906b99781709b5f77b9c2b277df9d51c4 (diff) | |
| parent | 6f1e443a519cd28d97be78c5ca2ca72a45f6b598 (diff) | |
Merge branch 'master' into stream_corked_pr
Diffstat (limited to 'include/grpc++')
| -rw-r--r-- | include/grpc++/support/channel_arguments.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/grpc++/support/channel_arguments.h b/include/grpc++/support/channel_arguments.h index 80a3bfda3d..61307d6194 100644 --- a/include/grpc++/support/channel_arguments.h +++ b/include/grpc++/support/channel_arguments.h @@ -117,10 +117,10 @@ class ChannelArguments { /// Return (by value) a c grpc_channel_args structure which points to /// arguments owned by this ChannelArguments instance - grpc_channel_args c_channel_args() { + grpc_channel_args c_channel_args() const { grpc_channel_args out; out.num_args = args_.size(); - out.args = args_.empty() ? NULL : &args_[0]; + out.args = args_.empty() ? NULL : const_cast<grpc_arg*>(&args_[0]); return out; } |