commit c2bd8a6d1a957276875ebecc72498d36daa12833
author yang-g <yangg@google.com> Thu Aug 20 11:40:12 2015 -0700
committer yang-g <yangg@google.com> Thu Aug 20 11:40:12 2015 -0700
tree c2c0629e6a1fc5f0037eb298e8015b4b00761dec
parent 431f8c2b5feecf202c484f6d0d1d7a0cf6f4be73

Fix server side and generic stub

include/grpc++/impl/rpc_method.h

diff --git a/include/grpc++/impl/rpc_method.h b/include/grpc++/impl/rpc_method.h
index 912ffab..9800268 100644
--- a/include/grpc++/impl/rpc_method.h
+++ b/include/grpc++/impl/rpc_method.h
@@ -49,6 +49,9 @@
     BIDI_STREAMING
   };
 
+  RpcMethod(const char* name, RpcType type)
+      : name_(name), method_type_(type), channel_tag_(NULL) {}
+
   RpcMethod(const char* name, RpcType type,
             const std::shared_ptr<Channel>& channel)
       : name_(name),

include/grpc++/impl/rpc_service_method.h

diff --git a/include/grpc++/impl/rpc_service_method.h b/include/grpc++/impl/rpc_service_method.h
index 925801e..078c8c4 100644
--- a/include/grpc++/impl/rpc_service_method.h
+++ b/include/grpc++/impl/rpc_service_method.h
@@ -229,7 +229,7 @@
   // Takes ownership of the handler
   RpcServiceMethod(const char* name, RpcMethod::RpcType type,
                    MethodHandler* handler)
-      : RpcMethod(name, type, nullptr), handler_(handler) {}
+      : RpcMethod(name, type), handler_(handler) {}
 
   MethodHandler* handler() { return handler_.get(); }
 

src/cpp/client/generic_stub.cc

diff --git a/src/cpp/client/generic_stub.cc b/src/cpp/client/generic_stub.cc
index 0c90578..ee89c02 100644
--- a/src/cpp/client/generic_stub.cc
+++ b/src/cpp/client/generic_stub.cc
@@ -44,8 +44,7 @@
   return std::unique_ptr<GenericClientAsyncReaderWriter>(
       new GenericClientAsyncReaderWriter(
           channel_.get(), cq,
-          RpcMethod(method.c_str(), RpcMethod::BIDI_STREAMING, nullptr),
-          context, tag));
+          RpcMethod(method.c_str(), RpcMethod::BIDI_STREAMING), context, tag));
 }
 
 }  // namespace grpc