Skip to content

Commit 255632c

Browse files
committed
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into pten/adjust_main_dir
2 parents c69edf3 + bfa0d7f commit 255632c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1031
-394
lines changed

paddle/fluid/distributed/service/heter_server.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ class HeterServer {
336336

337337
bool IsExit() { return service_.IsExit(); }
338338

339-
HeterServer() { this->ready_ = 0; }
339+
HeterServer() : service_(), ready_(0) {}
340340

341341
void RegisterServiceHandler(std::string message_name,
342342
HeterServiceHandler func);
@@ -391,7 +391,7 @@ class HeterServer {
391391
DISABLE_COPY_AND_ASSIGN(HeterServer);
392392
std::mutex mutex_ready_;
393393

394-
int ready_ = 0;
394+
int ready_;
395395
};
396396

397397
} // end namespace distributed

0 commit comments

Comments
 (0)