diff options
| author |  Adam Michalik <xyzzyz@google.com> | 2016-06-07 15:02:59 -0700 |
|---|---|---|
| committer | Adam Michalik <xyzzyz@google.com> | 2016-06-07 15:09:19 -0700 |
| commit | 4ad746e4e0077ea95d3e937a046575701592dd3f (patch) | |
| tree | ee1cd65b2afce58c3d2b4e949e3c9dcc5bb1f775 /src/cpp | |
| parent | b97e2d145efb4d0b407d18b43d3b7bb38bccf61f (diff) | |
clang-format, fix headers, windows fixes
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/client/create_channel_posix.cc | 5 | ||||
| -rw-r--r-- | src/cpp/server/server.cc | 8 | ||||
| -rw-r--r-- | src/cpp/server/server_posix.cc | 6 |
3 files changed, 6 insertions, 13 deletions
diff --git a/src/cpp/client/create_channel_posix.cc b/src/cpp/client/create_channel_posix.cc index 99ffebd392..60cfed3d62 100644 --- a/src/cpp/client/create_channel_posix.cc +++ b/src/cpp/client/create_channel_posix.cc @@ -31,7 +31,6 @@ * */ - #include <grpc++/channel.h> #include <grpc++/create_channel.h> #include <grpc++/impl/grpc_library.h> @@ -44,8 +43,8 @@ namespace grpc { #ifdef GPR_SUPPORT_CHANNELS_FROM_FD -std::shared_ptr<Channel> CreateInsecureChannelFromFd( - const grpc::string& target, int fd) { +std::shared_ptr<Channel> CreateInsecureChannelFromFd(const grpc::string& target, + int fd) { internal::GrpcLibrary init_lib; init_lib.init(); return CreateChannelInternal( diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc index 72a6150e96..50fc4733a1 100644 --- a/src/cpp/server/server.cc +++ b/src/cpp/server/server.cc @@ -329,13 +329,9 @@ void Server::SetGlobalCallbacks(GlobalCallbacks* callbacks) { g_callbacks.reset(callbacks); } -grpc_server* Server::c_server() { - return server_; -} +grpc_server* Server::c_server() { return server_; } -CompletionQueue* Server::completion_queue() { - return &cq_; -} +CompletionQueue* Server::completion_queue() { return &cq_; } static grpc_server_register_method_payload_handling PayloadHandlingForMethod( RpcServiceMethod* method) { diff --git a/src/cpp/server/server_posix.cc b/src/cpp/server/server_posix.cc index 7ed8cd069c..8cb9753a12 100644 --- a/src/cpp/server/server_posix.cc +++ b/src/cpp/server/server_posix.cc @@ -40,12 +40,10 @@ namespace grpc { #ifdef GPR_SUPPORT_CHANNELS_FROM_FD void AddInsecureChannelFromFd(Server* server, int fd) { - grpc_server_add_insecure_channel_from_fd(server->c_server(), - server->completion_queue()->cq(), - fd); + grpc_server_add_insecure_channel_from_fd( + server->c_server(), server->completion_queue()->cq(), fd); #endif // GPR_SUPPORT_CHANNELS_FROM_FD - } } // namespace grpc |