diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-04-28 07:40:40 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-04-28 07:40:40 -0700 |
| commit | a3c42cdcaf8b89944afc146363e400bc04336f05 (patch) | |
| tree | 5f65e89dbc51a575e21c6a202eb7ef98807beb86 /src/cpp | |
| parent | b33e2d3bc2641ece60e392677d52df57736e7aaa (diff) | |
| parent | 30862038340711e36a741ba166b7d198c3ad6b0a (diff) | |
Merge pull request #1378 from nicolasnoble/vs2010
Few VS2010 fixes.
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/server/server.cc | 9 | ||||
| -rw-r--r-- | src/cpp/server/server_builder.cc | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc index 1d39378595..4694a3a7ff 100644 --- a/src/cpp/server/server.cc +++ b/src/cpp/server/server.cc @@ -180,6 +180,7 @@ Server::Server(ThreadPoolInterface* thread_pool, bool thread_pool_owned) : started_(false), shutdown_(false), num_running_cb_(0), + sync_methods_(new std::list<SyncRequest>), server_(grpc_server_create(cq_.cq(), nullptr)), thread_pool_(thread_pool), thread_pool_owned_(thread_pool_owned) {} @@ -196,6 +197,7 @@ Server::~Server() { if (thread_pool_owned_) { delete thread_pool_; } + delete sync_methods_; } bool Server::RegisterService(RpcService* service) { @@ -208,7 +210,8 @@ bool Server::RegisterService(RpcService* service) { method->name()); return false; } - sync_methods_.emplace_back(method, tag); + SyncRequest request(method, tag); + sync_methods_->emplace_back(request); } return true; } @@ -250,8 +253,8 @@ bool Server::Start() { grpc_server_start(server_); // Start processing rpcs. - if (!sync_methods_.empty()) { - for (auto m = sync_methods_.begin(); m != sync_methods_.end(); m++) { + if (!sync_methods_->empty()) { + for (auto m = sync_methods_->begin(); m != sync_methods_->end(); m++) { m->Request(server_); } diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc index c5e115f396..81cb0e6724 100644 --- a/src/cpp/server/server_builder.cc +++ b/src/cpp/server/server_builder.cc @@ -66,7 +66,8 @@ void ServerBuilder::RegisterAsyncGenericService(AsyncGenericService* service) { void ServerBuilder::AddListeningPort(const grpc::string& addr, std::shared_ptr<ServerCredentials> creds, int* selected_port) { - ports_.push_back(Port{addr, creds, selected_port}); + Port port = {addr, creds, selected_port}; + ports_.push_back(port); } void ServerBuilder::SetThreadPool(ThreadPoolInterface* thread_pool) { |