rename NULL -> nullptr

This commit is contained in:
aozhiwei 2019-03-30 13:44:10 +08:00
parent f0f55569b3
commit 14d941779d

View File

@ -39,7 +39,7 @@ struct ReissueNode
{
int seqid = 0;
std::string orderid;
ReissueNode* next = NULL;
ReissueNode* next = nullptr;
};
void OrderMgr::Init()
@ -102,8 +102,8 @@ bool OrderMgr::HasTask()
add_order_mutex_->lock();
if (!work_node_ && top_node_) {
work_node_ = top_node_;
top_node_ = NULL;
bot_node_ = NULL;
top_node_ = nullptr;
bot_node_ = nullptr;
}
add_order_mutex_->unlock();
}
@ -116,8 +116,8 @@ bool OrderMgr::HasTask()
pay_notify_mutex_->lock();
if (!pay_notify_work_node_ && pay_notify_top_node_) {
pay_notify_work_node_ = pay_notify_top_node_;
pay_notify_top_node_ = NULL;
pay_notify_bot_node_ = NULL;
pay_notify_top_node_ = nullptr;
pay_notify_bot_node_ = nullptr;
}
pay_notify_mutex_->unlock();
}
@ -130,8 +130,8 @@ bool OrderMgr::HasTask()
reissue_mutex_->lock();
if (!reissue_work_node_ && reissue_top_node_) {
reissue_work_node_ = reissue_top_node_;
reissue_top_node_ = NULL;
reissue_bot_node_ = NULL;
reissue_top_node_ = nullptr;
reissue_bot_node_ = nullptr;
}
reissue_mutex_->unlock();
}
@ -284,8 +284,8 @@ void OrderMgr::ProcessOrderMsg()
if (!work_node_ && top_node_) {
add_order_mutex_->lock();
work_node_ = top_node_;
top_node_ = NULL;
bot_node_ = NULL;
top_node_ = nullptr;
bot_node_ = nullptr;
add_order_mutex_->unlock();
}
@ -309,8 +309,8 @@ void OrderMgr::ProcessReissueMsg()
if (!reissue_work_node_ && reissue_top_node_) {
reissue_mutex_->lock();
reissue_work_node_ = reissue_top_node_;
reissue_top_node_ = NULL;
reissue_bot_node_ = NULL;
reissue_top_node_ = nullptr;
reissue_bot_node_ = nullptr;
reissue_mutex_->unlock();
}
@ -329,8 +329,8 @@ void OrderMgr::ProcessNotifyMsg()
if (!pay_notify_work_node_ && pay_notify_top_node_) {
pay_notify_mutex_->lock();
pay_notify_work_node_ = pay_notify_top_node_;
pay_notify_top_node_ = NULL;
pay_notify_bot_node_ = NULL;
pay_notify_top_node_ = nullptr;
pay_notify_bot_node_ = nullptr;
pay_notify_mutex_->unlock();
}