diff options
| author |  Yang Gao <yangg@google.com> | 2015-05-01 10:57:14 -0700 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-05-01 10:57:14 -0700 |
| commit | 4db2954d1e78c9ecfd7843a7a9b87a3d9a583d32 (patch) | |
| tree | e8f23d5e23ce0c4d0dd278ed140631ebc42ba8c0 /include | |
| parent | c9e39c0728da270c1bced4938ee9745aeb208890 (diff) | |
| parent | e217307a6276cb5f08b07728197348a48595d0d6 (diff) | |
merge with head
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc++/channel_interface.h | 7 | ||||
| -rw-r--r-- | include/grpc/support/port_platform.h | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/grpc++/channel_interface.h b/include/grpc++/channel_interface.h index 4d48974e69..10fb9538bc 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,11 +49,12 @@ class CompletionQueue; class RpcMethod; class CallInterface; -class ChannelInterface : public CallHook { +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; }; diff --git a/include/grpc/support/port_platform.h b/include/grpc/support/port_platform.h index 864d669eda..671648a976 100644 --- a/include/grpc/support/port_platform.h +++ b/include/grpc/support/port_platform.h @@ -136,11 +136,12 @@ #endif #if TARGET_OS_IPHONE #define GPR_CPU_IPHONE 1 +#define GPR_PTHREAD_TLS 1 #else /* TARGET_OS_IPHONE */ #define GPR_CPU_POSIX 1 +#define GPR_GCC_TLS 1 #endif #define GPR_GCC_ATOMIC 1 -#define GPR_GCC_TLS 1 #define GPR_POSIX_LOG 1 #define GPR_POSIX_MULTIPOLL_WITH_POLL 1 #define GPR_POSIX_WAKEUP_FD 1 |