peranger/AimRT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix (#120)

Browse Source
This commit is contained in:
wtudio 2024-12-06 09:42:07 +08:00 committed by GitHub
parent 8c04a168e1
commit 37066a126e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -95,7 +95,10 @@ if(AIMRT_MASTER_PROJECT)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
endif() endif()
set(CMAKE_POSITION_INDEPENDENT_CODE ON) if(UNIX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
add_compile_options(/utf-8 /wd4819) add_compile_options(/utf-8 /wd4819)

6
src/interface/aimrt_module_cpp_interface/co/aimrt_context.h
View File

@ -253,7 +253,7 @@ class AimRTScheduler {
: executor_ref_(executor_ref) {} : executor_ref_(executor_ref) {}
template <typename Receiver> template <typename Receiver>
OperationState<unifex::remove_cvref_t<Receiver>> connect(Receiver&& receiver) { auto connect(Receiver&& receiver) {
return OperationState<unifex::remove_cvref_t<Receiver>>( return OperationState<unifex::remove_cvref_t<Receiver>>(
executor_ref_, (Receiver &&) receiver); executor_ref_, (Receiver &&) receiver);
} }
@ -308,7 +308,7 @@ class AimRTScheduler {
: executor_ref_(executor_ref), dt_(dt) {} : executor_ref_(executor_ref), dt_(dt) {}
template <typename Receiver> template <typename Receiver>
SchedulerAfterOperationState<unifex::remove_cvref_t<Receiver>> connect(Receiver&& receiver) { auto connect(Receiver&& receiver) {
return SchedulerAfterOperationState<unifex::remove_cvref_t<Receiver>>( return SchedulerAfterOperationState<unifex::remove_cvref_t<Receiver>>(
executor_ref_, dt_, (Receiver &&) receiver); executor_ref_, dt_, (Receiver &&) receiver);
} }
@ -364,7 +364,7 @@ class AimRTScheduler {
: executor_ref_(executor_ref), tp_(tp) {} : executor_ref_(executor_ref), tp_(tp) {}
template <typename Receiver> template <typename Receiver>
SchedulerAtOperationState<unifex::remove_cvref_t<Receiver>> connect(Receiver&& receiver) { auto connect(Receiver&& receiver) {
return SchedulerAtOperationState<unifex::remove_cvref_t<Receiver>>( return SchedulerAtOperationState<unifex::remove_cvref_t<Receiver>>(
executor_ref_, tp_, (Receiver &&) receiver); executor_ref_, tp_, (Receiver &&) receiver);
} }

2
src/runtime/core/aimrt_core.cc
View File

@ -245,7 +245,7 @@ void AimRTCore::ShutdownImpl() {
void AimRTCore::Start() { void AimRTCore::Start() {
StartImpl(); StartImpl();
AIMRT_INFO("AimRT start completed, will waiting for shutdown."); AIMRT_INFO("AimRT startup completed, will wait for shutdown.");
shutdown_promise_.get_future().wait(); shutdown_promise_.get_future().wait();
ShutdownImpl(); ShutdownImpl();