Merge pull request #18114 from equinox1993/master

Remove extra semicolons after function definitions
pull/18118/head
Vijay Pai 6 years ago committed by GitHub
commit e60c4fc034
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      include/grpcpp/impl/codegen/client_interceptor.h
  2. 2
      include/grpcpp/impl/codegen/interceptor.h
  3. 4
      include/grpcpp/impl/codegen/server_callback.h
  4. 2
      include/grpcpp/impl/codegen/server_interceptor.h
  5. 2
      include/grpcpp/security/credentials.h
  6. 4
      include/grpcpp/server.h
  7. 6
      src/compiler/protobuf_plugin.h
  8. 2
      src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.cc
  9. 2
      src/core/lib/gprpp/thd.h
  10. 2
      src/core/lib/iomgr/buffer_list.h
  11. 2
      src/cpp/common/core_codegen.cc
  12. 2
      src/cpp/server/server_cc.cc

@ -76,7 +76,7 @@ class ClientRpcInfo {
UNKNOWN // UNKNOWN is not API and will be removed later UNKNOWN // UNKNOWN is not API and will be removed later
}; };
~ClientRpcInfo(){}; ~ClientRpcInfo() {}
// Delete copy constructor but allow default move constructor // Delete copy constructor but allow default move constructor
ClientRpcInfo(const ClientRpcInfo&) = delete; ClientRpcInfo(const ClientRpcInfo&) = delete;

@ -90,7 +90,7 @@ enum class InterceptionHookPoints {
/// 5. Set some fields of an RPC at each interception point, when possible /// 5. Set some fields of an RPC at each interception point, when possible
class InterceptorBatchMethods { class InterceptorBatchMethods {
public: public:
virtual ~InterceptorBatchMethods(){}; virtual ~InterceptorBatchMethods() {}
/// Determine whether the current batch has an interception hook point /// Determine whether the current batch has an interception hook point
/// of type \a type /// of type \a type
virtual bool QueryInterceptionHookPoint(InterceptionHookPoints type) = 0; virtual bool QueryInterceptionHookPoint(InterceptionHookPoints type) = 0;

@ -102,7 +102,7 @@ class ServerCallbackWriter {
// Default implementation that can/should be overridden // Default implementation that can/should be overridden
Write(msg, std::move(options)); Write(msg, std::move(options));
Finish(std::move(s)); Finish(std::move(s));
}; }
protected: protected:
template <class Request> template <class Request>
@ -125,7 +125,7 @@ class ServerCallbackReaderWriter {
// Default implementation that can/should be overridden // Default implementation that can/should be overridden
Write(msg, std::move(options)); Write(msg, std::move(options));
Finish(std::move(s)); Finish(std::move(s));
}; }
protected: protected:
void BindReactor(ServerBidiReactor<Request, Response>* reactor) { void BindReactor(ServerBidiReactor<Request, Response>* reactor) {

@ -60,7 +60,7 @@ class ServerRpcInfo {
/// Type categorizes RPCs by unary or streaming type /// Type categorizes RPCs by unary or streaming type
enum class Type { UNARY, CLIENT_STREAMING, SERVER_STREAMING, BIDI_STREAMING }; enum class Type { UNARY, CLIENT_STREAMING, SERVER_STREAMING, BIDI_STREAMING };
~ServerRpcInfo(){}; ~ServerRpcInfo() {}
// Delete all copy and move constructors and assignments // Delete all copy and move constructors and assignments
ServerRpcInfo(const ServerRpcInfo&) = delete; ServerRpcInfo(const ServerRpcInfo&) = delete;

@ -95,7 +95,7 @@ class ChannelCredentials : private GrpcLibraryCodegen {
std::unique_ptr<experimental::ClientInterceptorFactoryInterface>> std::unique_ptr<experimental::ClientInterceptorFactoryInterface>>
interceptor_creators) { interceptor_creators) {
return nullptr; return nullptr;
}; }
}; };
/// A call credentials object encapsulates the state needed by a client to /// A call credentials object encapsulates the state needed by a client to

@ -189,7 +189,7 @@ class Server : public ServerInterface, private GrpcLibraryCodegen {
/// \param num_cqs How many completion queues does \a cqs hold. /// \param num_cqs How many completion queues does \a cqs hold.
void Start(ServerCompletionQueue** cqs, size_t num_cqs) override; void Start(ServerCompletionQueue** cqs, size_t num_cqs) override;
grpc_server* server() override { return server_; }; grpc_server* server() override { return server_; }
private: private:
std::vector<std::unique_ptr<experimental::ServerInterceptorFactoryInterface>>* std::vector<std::unique_ptr<experimental::ServerInterceptorFactoryInterface>>*
@ -223,7 +223,7 @@ class Server : public ServerInterface, private GrpcLibraryCodegen {
int max_receive_message_size() const override { int max_receive_message_size() const override {
return max_receive_message_size_; return max_receive_message_size_;
}; }
CompletionQueue* CallbackCQ() override; CompletionQueue* CallbackCQ() override;

@ -108,11 +108,11 @@ class ProtoBufService : public grpc_generator::Service {
grpc::string name() const { return service_->name(); } grpc::string name() const { return service_->name(); }
int method_count() const { return service_->method_count(); }; int method_count() const { return service_->method_count(); }
std::unique_ptr<const grpc_generator::Method> method(int i) const { std::unique_ptr<const grpc_generator::Method> method(int i) const {
return std::unique_ptr<const grpc_generator::Method>( return std::unique_ptr<const grpc_generator::Method>(
new ProtoBufMethod(service_->method(i))); new ProtoBufMethod(service_->method(i)));
}; }
grpc::string GetLeadingComments(const grpc::string prefix) const { grpc::string GetLeadingComments(const grpc::string prefix) const {
return GetCommentsHelper(service_, true, prefix); return GetCommentsHelper(service_, true, prefix);
@ -166,7 +166,7 @@ class ProtoBufFile : public grpc_generator::File {
grpc::string additional_headers() const { return ""; } grpc::string additional_headers() const { return ""; }
int service_count() const { return file_->service_count(); }; int service_count() const { return file_->service_count(); }
std::unique_ptr<const grpc_generator::Service> service(int i) const { std::unique_ptr<const grpc_generator::Service> service(int i) const {
return std::unique_ptr<const grpc_generator::Service>( return std::unique_ptr<const grpc_generator::Service>(
new ProtoBufService(file_->service(i))); new ProtoBufService(file_->service(i)));

@ -596,7 +596,7 @@ void GrpcLb::BalancerCallState::StartQuery() {
call_error = grpc_call_start_batch_and_execute( call_error = grpc_call_start_batch_and_execute(
lb_call_, ops, (size_t)(op - ops), &lb_on_balancer_status_received_); lb_call_, ops, (size_t)(op - ops), &lb_on_balancer_status_received_);
GPR_ASSERT(GRPC_CALL_OK == call_error); GPR_ASSERT(GRPC_CALL_OK == call_error);
}; }
void GrpcLb::BalancerCallState::ScheduleNextClientLoadReportLocked() { void GrpcLb::BalancerCallState::ScheduleNextClientLoadReportLocked() {
const grpc_millis next_client_load_report_time = const grpc_millis next_client_load_report_time =

@ -140,7 +140,7 @@ class Thread {
} else { } else {
GPR_ASSERT(state_ == FAILED); GPR_ASSERT(state_ == FAILED);
} }
}; }
private: private:
Thread(const Thread&) = delete; Thread(const Thread&) = delete;

@ -160,6 +160,6 @@ void grpc_tcp_set_write_timestamps_callback(void (*fn)(void*,
grpc_core::Timestamps*, grpc_core::Timestamps*,
grpc_error* error)); grpc_error* error));
}; /* namespace grpc_core */ } /* namespace grpc_core */
#endif /* GRPC_CORE_LIB_IOMGR_BUFFER_LIST_H */ #endif /* GRPC_CORE_LIB_IOMGR_BUFFER_LIST_H */

@ -81,7 +81,7 @@ void CoreCodegen::gpr_free(void* p) { return ::gpr_free(p); }
void CoreCodegen::grpc_init() { ::grpc_init(); } void CoreCodegen::grpc_init() { ::grpc_init(); }
void CoreCodegen::grpc_shutdown() { ::grpc_shutdown(); } void CoreCodegen::grpc_shutdown() { ::grpc_shutdown(); }
void CoreCodegen::gpr_mu_init(gpr_mu* mu) { ::gpr_mu_init(mu); }; void CoreCodegen::gpr_mu_init(gpr_mu* mu) { ::gpr_mu_init(mu); }
void CoreCodegen::gpr_mu_destroy(gpr_mu* mu) { ::gpr_mu_destroy(mu); } void CoreCodegen::gpr_mu_destroy(gpr_mu* mu) { ::gpr_mu_destroy(mu); }
void CoreCodegen::gpr_mu_lock(gpr_mu* mu) { ::gpr_mu_lock(mu); } void CoreCodegen::gpr_mu_lock(gpr_mu* mu) { ::gpr_mu_lock(mu); }
void CoreCodegen::gpr_mu_unlock(gpr_mu* mu) { ::gpr_mu_unlock(mu); } void CoreCodegen::gpr_mu_unlock(gpr_mu* mu) { ::gpr_mu_unlock(mu); }

@ -1251,6 +1251,6 @@ CompletionQueue* Server::CallbackCQ() {
shutdown_callback->TakeCQ(callback_cq_); shutdown_callback->TakeCQ(callback_cq_);
} }
return callback_cq_; return callback_cq_;
}; }
} // namespace grpc } // namespace grpc

Loading…
Cancel
Save