From 14d941779d25c754a1a1169ee63f8c968c91c335 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 30 Mar 2019 13:44:10 +0800 Subject: [PATCH] rename NULL -> nullptr --- server/payserver/ordermgr.cc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/server/payserver/ordermgr.cc b/server/payserver/ordermgr.cc index 70d5e84..bae0b5b 100644 --- a/server/payserver/ordermgr.cc +++ b/server/payserver/ordermgr.cc @@ -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(); }