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] 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 4d48974e69..e86a83bc45 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 46009d20ba..cd239247c8 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); -- GitLab