Skip to content
Snippets Groups Projects
Commit 6eda2d7c authored by Yang Gao's avatar Yang Gao
Browse files

Merge pull request #1386 from ctiller/cxx

Mac C++ compile fix
parents c48f26f5 3691c332
No related branches found
No related tags found
No related merge requests found
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
#ifndef GRPCXX_CHANNEL_INTERFACE_H #ifndef GRPCXX_CHANNEL_INTERFACE_H
#define GRPCXX_CHANNEL_INTERFACE_H #define GRPCXX_CHANNEL_INTERFACE_H
#include <memory>
#include <grpc++/status.h> #include <grpc++/status.h>
#include <grpc++/impl/call.h> #include <grpc++/impl/call.h>
...@@ -47,11 +49,12 @@ class CompletionQueue; ...@@ -47,11 +49,12 @@ class CompletionQueue;
class RpcMethod; class RpcMethod;
class CallInterface; class CallInterface;
class ChannelInterface : public CallHook { class ChannelInterface : public CallHook,
public std::enable_shared_from_this<ChannelInterface> {
public: public:
virtual ~ChannelInterface() {} 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, virtual Call CreateCall(const RpcMethod& method, ClientContext* context,
CompletionQueue* cq) = 0; CompletionQueue* cq) = 0;
}; };
......
...@@ -51,7 +51,6 @@ class Credentials; ...@@ -51,7 +51,6 @@ class Credentials;
class StreamContextInterface; class StreamContextInterface;
class Channel GRPC_FINAL : public GrpcLibrary, class Channel GRPC_FINAL : public GrpcLibrary,
public std::enable_shared_from_this<Channel>,
public ChannelInterface { public ChannelInterface {
public: public:
Channel(const grpc::string& target, grpc_channel* c_channel); Channel(const grpc::string& target, grpc_channel* c_channel);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment