diff options
| author |  Yang Gao <yangg@google.com> | 2015-04-28 17:07:35 -0700 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-04-28 17:07:35 -0700 |
| commit | 6eda2d7c8e4f0bcdfc3eb0a178bd8824fa66516f (patch) | |
| tree | de7ebfd1159176becb87390bbb2f59eb3c911526 /src | |
| parent | c48f26f5dc519fec2732bdf5fd29eaa50ad283ac (diff) | |
| parent | 3691c3322d09b9a7225745695650772981923028 (diff) | |
Merge pull request #1386 from ctiller/cxx
Mac C++ compile fix
Diffstat (limited to 'src')
| -rw-r--r-- | src/cpp/client/channel.h | 1 |
1 files changed, 0 insertions, 1 deletions
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); |