diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/grpc++/client_context.h | 11 | ||||
-rw-r--r-- | include/grpc++/support/channel_arguments.h | 3 | ||||
-rw-r--r-- | include/grpc++/support/time.h | 1 |
3 files changed, 10 insertions, 5 deletions
diff --git a/include/grpc++/client_context.h b/include/grpc++/client_context.h index 7046f939e5..82d97bd1ae 100644 --- a/include/grpc++/client_context.h +++ b/include/grpc++/client_context.h @@ -53,15 +53,16 @@ #include <memory> #include <string> -#include <grpc/compression.h> -#include <grpc/grpc.h> -#include <grpc/support/log.h> -#include <grpc/support/time.h> +#include <grpc++/impl/sync.h> #include <grpc++/security/auth_context.h> #include <grpc++/support/config.h> #include <grpc++/support/status.h> #include <grpc++/support/string_ref.h> #include <grpc++/support/time.h> +#include <grpc/compression.h> +#include <grpc/grpc.h> +#include <grpc/support/log.h> +#include <grpc/support/time.h> struct census_context; @@ -315,7 +316,9 @@ class ClientContext { bool initial_metadata_received_; std::shared_ptr<Channel> channel_; + grpc::mutex mu_; grpc_call* call_; + bool call_canceled_; gpr_timespec deadline_; grpc::string authority_; std::shared_ptr<Credentials> creds_; diff --git a/include/grpc++/support/channel_arguments.h b/include/grpc++/support/channel_arguments.h index 9957712a96..4da76a83ed 100644 --- a/include/grpc++/support/channel_arguments.h +++ b/include/grpc++/support/channel_arguments.h @@ -70,7 +70,8 @@ class ChannelArguments { void SetChannelArgs(grpc_channel_args* channel_args) const; // gRPC specific channel argument setters - /// Set target name override for SSL host name checking. + /// Set target name override for SSL host name checking. This option is for + /// testing only and should never be used in production. void SetSslTargetNameOverride(const grpc::string& name); // TODO(yangg) add flow control options /// Set the compression algorithm for the channel. diff --git a/include/grpc++/support/time.h b/include/grpc++/support/time.h index 2d4196b93b..e00e0d8e91 100644 --- a/include/grpc++/support/time.h +++ b/include/grpc++/support/time.h @@ -35,6 +35,7 @@ #define GRPCXX_SUPPORT_TIME_H #include <grpc++/support/config.h> +#include <grpc/support/time.h> namespace grpc { |