From b11728b90d5c4bbc3cae105b82b10bbf501f323f Mon Sep 17 00:00:00 2001
From: Craig Tiller <craig.tiller@gmail.com>
Date: Mon, 27 Apr 2015 18:27:04 -0700
Subject: [PATCH 1/3] Mac C++ compile fix

---
 include/grpc++/channel_interface.h | 6 +++++-
 src/cpp/client/channel.h           | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/grpc++/channel_interface.h b/include/grpc++/channel_interface.h
index 4d48974e691..e86a83bc45b 100644
--- a/include/grpc++/channel_interface.h
+++ b/include/grpc++/channel_interface.h
@@ -34,6 +34,8 @@
 #ifndef GRPCXX_CHANNEL_INTERFACE_H
 #define GRPCXX_CHANNEL_INTERFACE_H
 
+#include <memory>
+
 #include <grpc++/status.h>
 #include <grpc++/impl/call.h>
 
@@ -47,7 +49,9 @@ class CompletionQueue;
 class RpcMethod;
 class CallInterface;
 
-class ChannelInterface : public CallHook {
+class ChannelInterface 
+	: public CallHook, 
+      public std::enable_shared_from_this<ChannelInterface> {
  public:
   virtual ~ChannelInterface() {}
 
diff --git a/src/cpp/client/channel.h b/src/cpp/client/channel.h
index 46009d20bad..cd239247c82 100644
--- a/src/cpp/client/channel.h
+++ b/src/cpp/client/channel.h
@@ -51,7 +51,6 @@ class Credentials;
 class StreamContextInterface;
 
 class Channel GRPC_FINAL : public GrpcLibrary,
-                           public std::enable_shared_from_this<Channel>,
                            public ChannelInterface {
  public:
   Channel(const grpc::string& target, grpc_channel* c_channel);

From 75d5d303eaa53f4f561439e9cc93338e849028fe Mon Sep 17 00:00:00 2001
From: Craig Tiller <craig.tiller@gmail.com>
Date: Mon, 27 Apr 2015 18:29:09 -0700
Subject: [PATCH 2/3] Indentation fix

---
 include/grpc++/channel_interface.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/grpc++/channel_interface.h b/include/grpc++/channel_interface.h
index e86a83bc45b..bc738fb15a8 100644
--- a/include/grpc++/channel_interface.h
+++ b/include/grpc++/channel_interface.h
@@ -50,7 +50,7 @@ class RpcMethod;
 class CallInterface;
 
 class ChannelInterface 
-	: public CallHook, 
+    : public CallHook, 
       public std::enable_shared_from_this<ChannelInterface> {
  public:
   virtual ~ChannelInterface() {}

From 3691c3322d09b9a7225745695650772981923028 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Tue, 28 Apr 2015 08:01:45 -0700
Subject: [PATCH 3/3] clang-format

---
 include/grpc++/channel_interface.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/grpc++/channel_interface.h b/include/grpc++/channel_interface.h
index bc738fb15a8..10fb9538bcd 100644
--- a/include/grpc++/channel_interface.h
+++ b/include/grpc++/channel_interface.h
@@ -49,13 +49,12 @@ class CompletionQueue;
 class RpcMethod;
 class CallInterface;
 
-class ChannelInterface 
-    : public CallHook, 
-      public std::enable_shared_from_this<ChannelInterface> {
+class ChannelInterface : public CallHook,
+                         public std::enable_shared_from_this<ChannelInterface> {
  public:
   virtual ~ChannelInterface() {}
 
-  virtual void *RegisterMethod(const char *method_name) = 0;
+  virtual void* RegisterMethod(const char* method_name) = 0;
   virtual Call CreateCall(const RpcMethod& method, ClientContext* context,
                           CompletionQueue* cq) = 0;
 };