Fix errors from presubmit scripts.

pull/18374/head
Karthik Ravi Shankar 6 years ago
parent 4a0c3b848f
commit 2772f519e6
  1. 9
      include/grpcpp/create_channel.h
  2. 9
      include/grpcpp/security/credentials.h
  3. 9
      src/cpp/client/create_channel.cc
  4. 1
      tools/doxygen/Doxyfile.c++
  5. 1
      tools/doxygen/Doxyfile.c++.internal
  6. 2
      tools/run_tests/generated/sources_and_headers.json

@ -42,13 +42,14 @@ static inline std::shared_ptr<Channel> CreateCustomChannelWithInterceptors(
const grpc::string& target,
const std::shared_ptr<ChannelCredentials>& creds,
const ChannelArguments& args,
std::vector<
std::vector<
std::unique_ptr<experimental::ClientInterceptorFactoryInterface>>
interceptor_creators) {
return ::grpc_impl::experimental::CreateCustomChannelWithInterceptors(target, creds, args, std::move(interceptor_creators));
return ::grpc_impl::experimental::CreateCustomChannelWithInterceptors(
target, creds, args, std::move(interceptor_creators));
}
} // namespace experimental
} // namespace grpc
} // namespace experimental
} // namespace grpc
#endif // GRPCPP_CREATE_CHANNEL_H

@ -37,12 +37,12 @@ namespace grpc {
class CallCredentials;
class ChannelArguments;
class ChannelCredentials;
}
} // namespace grpc
namespace grpc_impl {
std::shared_ptr<grpc::Channel> CreateCustomChannel(
const grpc::string& target,
const std::shared_ptr<grpc::ChannelCredentials>& creds,
const grpc::ChannelArguments& args);
const grpc::string& target,
const std::shared_ptr<grpc::ChannelCredentials>& creds,
const grpc::ChannelArguments& args);
namespace experimental {
std::shared_ptr<grpc::Channel> CreateCustomChannelWithInterceptors(
@ -59,7 +59,6 @@ class Channel;
class SecureChannelCredentials;
class SecureCallCredentials;
/// A channel credentials object encapsulates all the state needed by a client
/// to authenticate with a server for a given channel.
/// It can make various assertions, e.g., about the client’s identity, role

@ -40,7 +40,8 @@ std::shared_ptr<grpc::Channel> CreateCustomChannel(
const grpc::string& target,
const std::shared_ptr<grpc::ChannelCredentials>& creds,
const grpc::ChannelArguments& args) {
grpc::GrpcLibraryCodegen init_lib; // We need to call init in case of a bad creds.
grpc::GrpcLibraryCodegen
init_lib; // We need to call init in case of a bad creds.
return creds ? creds->CreateChannel(target, args)
: grpc::CreateChannelInternal(
"",
@ -48,7 +49,8 @@ std::shared_ptr<grpc::Channel> CreateCustomChannel(
nullptr, GRPC_STATUS_INVALID_ARGUMENT,
"Invalid credentials."),
std::vector<std::unique_ptr<
grpc::experimental::ClientInterceptorFactoryInterface>>());
grpc::experimental::
ClientInterceptorFactoryInterface>>());
}
namespace experimental {
@ -78,7 +80,8 @@ std::shared_ptr<grpc::Channel> CreateCustomChannelWithInterceptors(
nullptr, GRPC_STATUS_INVALID_ARGUMENT,
"Invalid credentials."),
std::vector<std::unique_ptr<
grpc::experimental::ClientInterceptorFactoryInterface>>());
grpc::experimental::
ClientInterceptorFactoryInterface>>());
}
} // namespace experimental

@ -930,6 +930,7 @@ include/grpcpp/channel.h \
include/grpcpp/client_context.h \
include/grpcpp/completion_queue.h \
include/grpcpp/create_channel.h \
include/grpcpp/create_channel_impl.h \
include/grpcpp/create_channel_posix.h \
include/grpcpp/ext/health_check_service_server_builder_option.h \
include/grpcpp/generic/async_generic_service.h \

@ -931,6 +931,7 @@ include/grpcpp/channel.h \
include/grpcpp/client_context.h \
include/grpcpp/completion_queue.h \
include/grpcpp/create_channel.h \
include/grpcpp/create_channel_impl.h \
include/grpcpp/create_channel_posix.h \
include/grpcpp/ext/health_check_service_server_builder_option.h \
include/grpcpp/generic/async_generic_service.h \

@ -11414,6 +11414,7 @@
"include/grpcpp/client_context.h",
"include/grpcpp/completion_queue.h",
"include/grpcpp/create_channel.h",
"include/grpcpp/create_channel_impl.h",
"include/grpcpp/create_channel_posix.h",
"include/grpcpp/ext/health_check_service_server_builder_option.h",
"include/grpcpp/generic/async_generic_service.h",
@ -11523,6 +11524,7 @@
"include/grpcpp/client_context.h",
"include/grpcpp/completion_queue.h",
"include/grpcpp/create_channel.h",
"include/grpcpp/create_channel_impl.h",
"include/grpcpp/create_channel_posix.h",
"include/grpcpp/ext/health_check_service_server_builder_option.h",
"include/grpcpp/generic/async_generic_service.h",

Loading…
Cancel
Save