Merge branch 'new_invoke_api' of github.com:google/grpc into update-api

Conflicts:
	src/cpp/client/channel.cc
	src/cpp/stream/stream_context.cc
	src/cpp/stream/stream_context.h
	src/php/ext/grpc/call.c
	test/core/end2end/tests/max_concurrent_streams.c

1 files changed, 7 insertions, 10 deletions

diff --git a/src/cpp/stream/stream_context.h b/src/cpp/stream/stream_context.h
index 8697d86e83..fcc4239c90 100644
--- a/src/cpp/stream/stream_context.h
+++ b/src/cpp/stream/stream_context.h
@@ -72,16 +72,13 @@ class StreamContext final : public StreamContextInterface {
   // Unique tags for plucking events from the c layer. this pointer is casted
   // to char* to create single byte step between tags. It implicitly relies on
   // that StreamContext is large enough to contain all the pointers.
-  void *finished_tag() { return reinterpret_cast<char *>(this); }
-  void *read_tag() { return reinterpret_cast<char *>(this) + 1; }
-  void *write_tag() { return reinterpret_cast<char *>(this) + 2; }
-  void *halfclose_tag() { return reinterpret_cast<char *>(this) + 3; }
-  void *invoke_tag() { return reinterpret_cast<char *>(this) + 4; }
-  void *client_metadata_read_tag() {
-    return reinterpret_cast<char *>(this) + 5;
-  }
-  grpc_call *call() { return call_; }
-  grpc_completion_queue *cq() { return cq_; }
+  void* finished_tag() { return reinterpret_cast<char*>(this); }
+  void* read_tag() { return reinterpret_cast<char*>(this) + 1; }
+  void* write_tag() { return reinterpret_cast<char*>(this) + 2; }
+  void* halfclose_tag() { return reinterpret_cast<char*>(this) + 3; }
+  void* client_metadata_read_tag() { return reinterpret_cast<char*>(this) + 5; }
+  grpc_call* call() { return call_; }
+  grpc_completion_queue* cq() { return cq_; }
 
   bool is_client_;
   const RpcMethod *method_;             // not owned