Merge pull request #11134 from jacquesqiao/fix-mac-build

fix build error on mac
wangkuiyi-patch-1
Qiao Longfei 7 years ago committed by GitHub
commit c7002f5ba2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -71,8 +71,6 @@ class AsyncGRPCServer final : public RPCServer {
std::unique_ptr<::grpc::Server> server_;
// condition of the sub program
std::mutex barrier_mutex_;
mutable int barrier_cond_step_;
std::condition_variable barrier_condition_;
std::mutex mutex_ready_;

@ -222,8 +222,8 @@ static void FillRequestCtx(detail::RequestHandler *h, framework::Scope *scope,
h->SetDevCtx(dev_ctx);
h->SetExecutor(executor);
h->SetProgram(program);
h->SetPrefetchPreparedCtx(std::move(
std::unique_ptr<framework::ExecutorPrepareContext>(prefetch_ctx)));
h->SetPrefetchPreparedCtx(
std::unique_ptr<framework::ExecutorPrepareContext>(prefetch_ctx));
h->SetRPCServer(rpc_server);
}

Loading…
Cancel
Save