Fixed some namespace-related issues.
This commit is contained in:
parent
af9ec263a1
commit
75748915ed
@ -38,7 +38,7 @@ protected:
|
|||||||
|
|
||||||
// Friends
|
// Friends
|
||||||
template<class, class> friend class StateHandle;
|
template<class, class> friend class StateHandle;
|
||||||
friend class ::TaskFSM;
|
friend class NAMESPACE_SQUID::TaskFSM;
|
||||||
|
|
||||||
// Constructors (friend-only)
|
// Constructors (friend-only)
|
||||||
LinkHandle() = delete;
|
LinkHandle() = delete;
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
#if SQUID_ENABLE_TASK_DEBUG
|
#if SQUID_ENABLE_TASK_DEBUG
|
||||||
/// @ingroup Tasks
|
/// @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__)
|
/// @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 DEBUG_STR , std::string in_debugStr
|
||||||
#define PASS_DEBUG_STR , in_debugStr
|
#define PASS_DEBUG_STR , in_debugStr
|
||||||
#define MANUAL_DEBUG_STR(debugStr) , debugStr
|
#define MANUAL_DEBUG_STR(debugStr) , debugStr
|
||||||
|
@ -102,7 +102,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
friend class ::TaskFSM;
|
friend class NAMESPACE_SQUID::TaskFSM;
|
||||||
|
|
||||||
StateHandle() = delete;
|
StateHandle() = delete;
|
||||||
StateHandle(std::shared_ptr<State<tStateInput, tStateConstructorFn>> InStatePtr)
|
StateHandle(std::shared_ptr<State<tStateInput, tStateConstructorFn>> InStatePtr)
|
||||||
|
@ -61,6 +61,8 @@ Task<> TestFsmTask()
|
|||||||
auto fsmTask = fsm.Run();
|
auto fsmTask = fsm.Run();
|
||||||
fsmTask.RequestStop();
|
fsmTask.RequestStop();
|
||||||
co_await std::move(fsmTask);
|
co_await std::move(fsmTask);
|
||||||
|
|
||||||
|
co_await WaitUntil([] { return true; });
|
||||||
}
|
}
|
||||||
|
|
||||||
void TestTaskFSM()
|
void TestTaskFSM()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user