aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/grpc++
diff options
context:
space:
mode:
authorGravatar Sree Kuchibhotla <sreek@google.com>2017-03-22 13:00:18 -0700
committerGravatar Sree Kuchibhotla <sreek@google.com>2017-03-22 13:00:18 -0700
commit12081c0304666f770985388e9805a6285cf2c09f (patch)
treea8917834b1f023323a12573235a25f00c76f5539 /include/grpc++
parent8d8bb7a51557b0ce61ad79324bc5cb538918f6ac (diff)
parente414d6cf00bddd50054c0e869091159331736da4 (diff)
Merge branch 'cq_create_api_changes' into cq_create_api_changes_with_factory
Diffstat (limited to 'include/grpc++')
-rw-r--r--include/grpc++/support/channel_arguments.h4
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;
}