aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/grpc++/channel.h
diff options
context:
space:
mode:
authorGravatar David Garcia Quintas <dgq@google.com>2016-01-27 18:41:26 -0800
committerGravatar David Garcia Quintas <dgq@google.com>2016-01-27 18:41:26 -0800
commite1300deb87b5fca2b4361a753d0bd4d19b078ea4 (patch)
tree62016bec7621d6f1650472c20d56fdbf713f077c /include/grpc++/channel.h
parent6a48405ed003a416bd574d3f480b20e3dee9e9df (diff)
After GrpcLibrary refactoring. Compiles and passes. WIP still
Diffstat (limited to 'include/grpc++/channel.h')
-rw-r--r--include/grpc++/channel.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/grpc++/channel.h b/include/grpc++/channel.h
index d6f55a8bf6..80547f7ab8 100644
--- a/include/grpc++/channel.h
+++ b/include/grpc++/channel.h
@@ -36,20 +36,20 @@
#include <memory>
-#include <grpc/grpc.h>
#include <grpc++/impl/call.h>
#include <grpc++/impl/codegen/channel_interface.h>
-#include <grpc++/impl/grpc_library.h>
-#include <grpc++/support/config.h>
+#include <grpc++/impl/codegen/config.h>
+#include <grpc++/impl/codegen/grpc_library.h>
+#include <grpc/grpc.h>
struct grpc_channel;
namespace grpc {
/// Channels represent a connection to an endpoint. Created by \a CreateChannel.
class Channel GRPC_FINAL : public ChannelInterface,
- public GrpcLibrary,
public CallHook,
- public std::enable_shared_from_this<Channel> {
+ public std::enable_shared_from_this<Channel>,
+ private GrpcLibrary {
public:
~Channel();