1 files changed, 14 insertions, 12 deletions

diff --git a/include/grpc++/impl/call.h b/include/grpc++/impl/call.h
index 2716bfe93a..9790349d45 100644
--- a/include/grpc++/impl/call.h
+++ b/include/grpc++/impl/call.h
@@ -175,28 +175,30 @@ class CallOpRecvMessage {
 namespace CallOpGenericRecvMessageHelper {
 class DeserializeFunc {
  public:
-  virtual Status deser(grpc_byte_buffer* buf,int max_message_size) = 0;
+  virtual Status Deserialize(grpc_byte_buffer* buf, int max_message_size) = 0;
 };
 
-template<class R> class DeserializeFuncType : public DeserializeFunc {
+template <class R>
+class DeserializeFuncType : public DeserializeFunc {
  public:
-  DeserializeFuncType(R *message): message_(message) {}
-  Status deser(grpc_byte_buffer* buf,int max_message_size) {
-    return SerializationTraits<R>::Deserialize(buf, message_,
-					       max_message_size);
+  DeserializeFuncType(R* message) : message_(message) {}
+  Status Deserialize(grpc_byte_buffer* buf, int max_message_size) {
+    return SerializationTraits<R>::Deserialize(buf, message_, max_message_size);
   }
+
  private:
-  R *message_; // Not a managed pointer because management is external to this
+  R* message_;  // Not a managed pointer because management is external to this
 };
-}; // namespace CallOpGenericRecvMessageHelper
+}  // namespace CallOpGenericRecvMessageHelper
 
 class CallOpGenericRecvMessage {
  public:
   CallOpGenericRecvMessage() : got_message(false) {}
 
-  template <class R> void RecvMessage(R* message) {
-    deserialize_.reset(new CallOpGenericRecvMessageHelper::
-		       DeserializeFuncType<R>(message));
+  template <class R>
+  void RecvMessage(R* message) {
+    deserialize_.reset(
+        new CallOpGenericRecvMessageHelper::DeserializeFuncType<R>(message));
   }
 
   bool got_message;
@@ -215,7 +217,7 @@ class CallOpGenericRecvMessage {
     if (recv_buf_) {
       if (*status) {
         got_message = true;
-        *status = deserialize_->deser(recv_buf_, max_message_size).ok();
+        *status = deserialize_->Deserialize(recv_buf_, max_message_size).ok();
       } else {
         got_message = false;
         grpc_byte_buffer_destroy(recv_buf_);