diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2016-10-03 09:20:52 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2016-10-03 09:20:52 -0700 |
| commit | 384eea80baeb97fca5e8771607af504dee45acf2 (patch) | |
| tree | a04cfe94ae49e6bdb8d218ce6dd2a8a381a08242 /include/grpc++ | |
| parent | 3b2bc2deb1a249fd6d260adb50c39064ef5f9c2c (diff) | |
| parent | ecc5a40bd32a5f633d158496a0291b4081c70849 (diff) | |
Merge remote-tracking branch 'upstream/master' into rpc_mgr
Diffstat (limited to 'include/grpc++')
| -rw-r--r-- | include/grpc++/create_channel_posix.h | 10 | ||||
| -rw-r--r-- | include/grpc++/ext/reflection.grpc.pb.h | 2 | ||||
| -rw-r--r-- | include/grpc++/ext/reflection.pb.h | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/include/grpc++/create_channel_posix.h b/include/grpc++/create_channel_posix.h index 0d96159942..2af12e6c36 100644 --- a/include/grpc++/create_channel_posix.h +++ b/include/grpc++/create_channel_posix.h @@ -37,6 +37,7 @@ #include <memory> #include <grpc++/channel.h> +#include <grpc++/support/channel_arguments.h> #include <grpc/support/port_platform.h> namespace grpc { @@ -50,6 +51,15 @@ namespace grpc { std::shared_ptr<Channel> CreateInsecureChannelFromFd(const grpc::string& target, int fd); +/// Create a new \a Channel communicating over given file descriptor with custom +/// channel arguments +/// +/// \param target The name of the target. +/// \param fd The file descriptor representing a socket. +/// \param args Options for channel creation. +std::shared_ptr<Channel> CreateCustomInsecureChannelFromFd( + const grpc::string& target, int fd, const ChannelArguments& args); + #endif // GPR_SUPPORT_CHANNELS_FROM_FD } // namespace grpc diff --git a/include/grpc++/ext/reflection.grpc.pb.h b/include/grpc++/ext/reflection.grpc.pb.h index 064117e303..6e56088497 100644 --- a/include/grpc++/ext/reflection.grpc.pb.h +++ b/include/grpc++/ext/reflection.grpc.pb.h @@ -32,7 +32,7 @@ */ -// Generated by the gRPC protobuf plugin. +// Generated by tools/codegen/extensions/gen_reflection_proto.sh // If you make any local change, they will be lost. // source: reflection.proto // Original file comments: diff --git a/include/grpc++/ext/reflection.pb.h b/include/grpc++/ext/reflection.pb.h index bdb86197d0..caa1592424 100644 --- a/include/grpc++/ext/reflection.pb.h +++ b/include/grpc++/ext/reflection.pb.h @@ -32,7 +32,7 @@ */ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by tools/codegen/extensions/gen_reflection_proto.sh // source: reflection.proto #ifndef PROTOBUF_reflection_2eproto__INCLUDED |