aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar makdharma <makarandd@google.com>2018-03-13 09:46:08 -0700
committerGravatar makdharma <makarandd@google.com>2018-03-13 09:46:08 -0700
commit626a65e877ef90d4e975c221ad24cad4d9187cce (patch)
tree0e53dc20ea9cd1ef084ad0f59914724f689efd15 /include
parentdbf4b71a00861013ec69d39782203fd995fdc147 (diff)
Added protected default constructor
Diffstat (limited to 'include')
-rw-r--r--include/grpcpp/impl/codegen/completion_queue.h5
-rw-r--r--include/grpcpp/server.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/include/grpcpp/impl/codegen/completion_queue.h b/include/grpcpp/impl/codegen/completion_queue.h
index ea43777bfc..104a603129 100644
--- a/include/grpcpp/impl/codegen/completion_queue.h
+++ b/include/grpcpp/impl/codegen/completion_queue.h
@@ -366,6 +366,10 @@ class ServerCompletionQueue : public CompletionQueue {
bool IsFrequentlyPolled() { return polling_type_ != GRPC_CQ_NON_LISTENING; }
protected:
+ // Default constructor
+ ServerCompletionQueue() {}
+
+ private:
/// \param is_frequently_polled Informs the GRPC library about whether the
/// server completion queue would be actively polled (by calling Next() or
/// AsyncNext()). By default all server completion queues are assumed to be
@@ -375,7 +379,6 @@ class ServerCompletionQueue : public CompletionQueue {
GRPC_CQ_CURRENT_VERSION, GRPC_CQ_NEXT, polling_type}),
polling_type_(polling_type) {}
- private:
grpc_cq_polling_type polling_type_;
friend class ServerBuilder;
};
diff --git a/include/grpcpp/server.h b/include/grpcpp/server.h
index 69d7a3f478..6056003fcd 100644
--- a/include/grpcpp/server.h
+++ b/include/grpcpp/server.h
@@ -204,7 +204,7 @@ class Server : public ServerInterface, private GrpcLibraryCodegen {
// Server status
std::mutex mu_;
- // Server status
+
bool started_;
bool shutdown_;
bool shutdown_notified_; // Was notify called on the shutdown_cv_