aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/grpc++
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-02-09 13:47:39 -0800
committerGravatar Craig Tiller <ctiller@google.com>2015-02-09 13:47:39 -0800
commit0db1befae1a85c4a1d7a8ac09dd959555117827e (patch)
treef07db27f06a587aa3377e7a161f7e331d961c24f /include/grpc++
parent14a65f976060a68982b6e17a8cb76fb770579afb (diff)
Progress
Diffstat (limited to 'include/grpc++')
-rw-r--r--include/grpc++/server.h8
-rw-r--r--include/grpc++/server_builder.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/include/grpc++/server.h b/include/grpc++/server.h
index 3931d9a1bc..ae86683f0b 100644
--- a/include/grpc++/server.h
+++ b/include/grpc++/server.h
@@ -70,15 +70,15 @@ class Server {
friend class ServerBuilder;
// ServerBuilder use only
- Server(ThreadPoolInterface* thread_pool, ServerCredentials* creds);
+ Server(ThreadPoolInterface* thread_pool, bool thread_pool_owned, ServerCredentials* creds);
Server();
// Register a service. This call does not take ownership of the service.
// The service must exist for the lifetime of the Server instance.
- void RegisterService(RpcService* service);
+ bool RegisterService(RpcService* service);
// Add a listening port. Can be called multiple times.
- void AddPort(const grpc::string& addr);
+ int AddPort(const grpc::string& addr);
// Start the server.
- void Start();
+ bool Start();
void AllowOneRpc();
void HandleQueueClosed();
diff --git a/include/grpc++/server_builder.h b/include/grpc++/server_builder.h
index f9a40b302d..8b4c81bc87 100644
--- a/include/grpc++/server_builder.h
+++ b/include/grpc++/server_builder.h
@@ -57,7 +57,7 @@ class ServerBuilder {
// BuildAndStart().
void RegisterService(SynchronousService* service);
- void ReigsterAsyncService(AsynchronousService *service);
+ void RegisterAsyncService(AsynchronousService *service);
// Add a listening port. Can be called multiple times.
void AddPort(const grpc::string& addr);
@@ -78,7 +78,7 @@ class ServerBuilder {
std::vector<AsynchronousService*> async_services_;
std::vector<grpc::string> ports_;
std::shared_ptr<ServerCredentials> creds_;
- ThreadPoolInterface* thread_pool_;
+ ThreadPoolInterface* thread_pool_ = nullptr;
};
} // namespace grpc