From 75748915ed0c09a8a065e96aeb79b44e1fcae228 Mon Sep 17 00:00:00 2001 From: Tim Ambrogi Date: Thu, 19 May 2022 11:11:08 -0400 Subject: [PATCH] Fixed some namespace-related issues. --- include/Private/TaskFSMPrivate.h | 2 +- include/Task.h | 2 +- include/TaskFSM.h | 2 +- samples/Sample_Tests/Main.cpp | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/Private/TaskFSMPrivate.h b/include/Private/TaskFSMPrivate.h index 3a0c297..54d21e5 100644 --- a/include/Private/TaskFSMPrivate.h +++ b/include/Private/TaskFSMPrivate.h @@ -38,7 +38,7 @@ protected: // Friends template friend class StateHandle; - friend class ::TaskFSM; + friend class NAMESPACE_SQUID::TaskFSM; // Constructors (friend-only) LinkHandle() = delete; diff --git a/include/Task.h b/include/Task.h index ebaadf8..321097e 100644 --- a/include/Task.h +++ b/include/Task.h @@ -22,7 +22,7 @@ #if SQUID_ENABLE_TASK_DEBUG /// @ingroup Tasks /// @brief Macro that instruments a task with a debug name string. Usually at the top of every task coroutine as @c TASK_NAME(__FUNCTION__) -#define TASK_NAME(...) co_await SetDebugName(__VA_ARGS__); +#define TASK_NAME(...) co_await NAMESPACE_SQUID::SetDebugName(__VA_ARGS__); #define DEBUG_STR , std::string in_debugStr #define PASS_DEBUG_STR , in_debugStr #define MANUAL_DEBUG_STR(debugStr) , debugStr diff --git a/include/TaskFSM.h b/include/TaskFSM.h index 033bb81..750c2ad 100644 --- a/include/TaskFSM.h +++ b/include/TaskFSM.h @@ -102,7 +102,7 @@ public: } private: - friend class ::TaskFSM; + friend class NAMESPACE_SQUID::TaskFSM; StateHandle() = delete; StateHandle(std::shared_ptr> InStatePtr) diff --git a/samples/Sample_Tests/Main.cpp b/samples/Sample_Tests/Main.cpp index 21ceb7a..35e1430 100644 --- a/samples/Sample_Tests/Main.cpp +++ b/samples/Sample_Tests/Main.cpp @@ -61,6 +61,8 @@ Task<> TestFsmTask() auto fsmTask = fsm.Run(); fsmTask.RequestStop(); co_await std::move(fsmTask); + + co_await WaitUntil([] { return true; }); } void TestTaskFSM()