From 4e04485d4e4b42cc480a131ae43ca8d8e75bc995 Mon Sep 17 00:00:00 2001 From: Xie Han <63350856@qq.com> Date: Fri, 13 Dec 2024 16:28:16 +0800 Subject: [PATCH] std:nullptr_t -> nullptr_t --- src/factory/WFTaskFactory.h | 5 +++-- src/factory/WFTaskFactory.inl | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/factory/WFTaskFactory.h b/src/factory/WFTaskFactory.h index 28c6397d22..565588ea5f 100644 --- a/src/factory/WFTaskFactory.h +++ b/src/factory/WFTaskFactory.h @@ -21,6 +21,7 @@ #define _WFTASKFACTORY_H_ #include +#include #include #include "PlatformSocket.h" #include "URIParser.h" @@ -392,7 +393,7 @@ class WFTaskFactory return WFTaskFactory::send_by_name(mailbox_name, (void *)msg, max); } - static int send_by_name(const std::string& mailbox_name, std::nullptr_t msg, + static int send_by_name(const std::string& mailbox_name, nullptr_t msg, size_t max) { return WFTaskFactory::send_by_name(mailbox_name, (void *)0, max); @@ -404,7 +405,7 @@ class WFTaskFactory return WFTaskFactory::signal_by_name(cond_name, (void *)msg, max); } - static int signal_by_name(const std::string& cond_name, std::nullptr_t msg, + static int signal_by_name(const std::string& cond_name, nullptr_t msg, size_t max) { return WFTaskFactory::signal_by_name(cond_name, (void *)0, max); diff --git a/src/factory/WFTaskFactory.inl b/src/factory/WFTaskFactory.inl index 8f11411490..78aa5ad914 100644 --- a/src/factory/WFTaskFactory.inl +++ b/src/factory/WFTaskFactory.inl @@ -713,7 +713,7 @@ void WFTaskFactory::reset_go_task(WFGoTask *task, FUNC&& func, ARGS&&... args) template<> inline WFGoTask *WFTaskFactory::create_go_task(const std::string& queue_name, - std::nullptr_t&& func) + nullptr_t&& func) { return new __WFGoTask(WFGlobal::get_exec_queue(queue_name), WFGlobal::get_compute_executor(), @@ -723,7 +723,7 @@ WFGoTask *WFTaskFactory::create_go_task(const std::string& queue_name, template<> inline WFGoTask *WFTaskFactory::create_timedgo_task(time_t seconds, long nanoseconds, const std::string& queue_name, - std::nullptr_t&& func) + nullptr_t&& func) { return new __WFTimedGoTask(seconds, nanoseconds, WFGlobal::get_exec_queue(queue_name), @@ -733,7 +733,7 @@ WFGoTask *WFTaskFactory::create_timedgo_task(time_t seconds, long nanoseconds, template<> inline WFGoTask *WFTaskFactory::create_go_task(ExecQueue *queue, Executor *executor, - std::nullptr_t&& func) + nullptr_t&& func) { return new __WFGoTask(queue, executor, nullptr); } @@ -741,13 +741,13 @@ WFGoTask *WFTaskFactory::create_go_task(ExecQueue *queue, Executor *executor, template<> inline WFGoTask *WFTaskFactory::create_timedgo_task(time_t seconds, long nanoseconds, ExecQueue *queue, Executor *executor, - std::nullptr_t&& func) + nullptr_t&& func) { return new __WFTimedGoTask(seconds, nanoseconds, queue, executor, nullptr); } template<> inline -void WFTaskFactory::reset_go_task(WFGoTask *task, std::nullptr_t&& func) +void WFTaskFactory::reset_go_task(WFGoTask *task, nullptr_t&& func) { ((__WFGoTask *)task)->set_go_func(nullptr); }