diff options
author | 2017-10-17 09:07:48 -0700 | |
---|---|---|
committer | 2017-10-17 09:07:48 -0700 | |
commit | 71f0e5ecd101a3129c0d078717ac331503bf377e (patch) | |
tree | adfbeccf48a3b84c06cc5fd145a165ef45a59ca5 /include/grpc++/impl | |
parent | 37e61863e6ffdbd395bd0fee0daa984f88e21bae (diff) | |
parent | 48bed5ec63a3a2c78170d3e24530558c1c93d666 (diff) |
Merge branch 'pid++' of github.com:ctiller/grpc into pid++
Diffstat (limited to 'include/grpc++/impl')
-rw-r--r-- | include/grpc++/impl/codegen/call.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/grpc++/impl/codegen/call.h b/include/grpc++/impl/codegen/call.h index d9988e51fc..00521a55ff 100644 --- a/include/grpc++/impl/codegen/call.h +++ b/include/grpc++/impl/codegen/call.h @@ -318,7 +318,11 @@ template <class M> Status CallOpSendMessage::SendMessage(const M& message, WriteOptions options) { write_options_ = options; bool own_buf; - Status result = SerializationTraits<M>::Serialize( + // TODO(vjpai): Remove the void below when possible + // The void in the template parameter below should not be needed + // (since it should be implicit) but is needed due to an observed + // difference in behavior between clang and gcc for certain internal users + Status result = SerializationTraits<M, void>::Serialize( message, send_buf_.bbuf_ptr(), &own_buf); if (!own_buf) { send_buf_.Duplicate(); |