Qt6 Migration: BUILD_RTI guards und CMake fixes
- BUILD_RTI conditional compilation für RTI Connext DDS dependencies - Namespace fixes in core_dtc.h (Core:: → DDS::Core::) - CMakeLists.txt: BUILD_RTI option und conditional dependencies - Handler minelayer: namespace closing mit BUILD_RTI guard - Build erfolgreich mit BUILD_RTI=OFF validiert Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
This commit is contained in:
422 files changed
+1013
-599
No files matched your search
@@ -2,6 +2,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#if BUILD_RTI
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <dds/core/cond/GuardCondition.hpp>
|
||||
#include <dds/core/cond/StatusCondition.hpp>
|
||||
@@ -280,7 +282,7 @@ template <typename REQUEST, typename REPLY> class Requester final : public Reply
|
||||
, m_dataReader(nullptr)
|
||||
, m_contentFilteredTopic(nullptr)
|
||||
, m_curInstanceHandle(dds::core::InstanceHandle::nil())
|
||||
.getNGLLogger("connext.requester"))
|
||||
, m_logger(NGL::getNGLLogger("connext.requester"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -429,7 +431,7 @@ template <typename REQUEST, typename REPLY> class Replier final : public ReplyRe
|
||||
, m_dataReader(dds::sub::DataReader<REQUEST>(replierParams.subscriber(),
|
||||
ReplyRequestBase<REQUEST, REPLY>::m_requestTopic,
|
||||
replierParams.datareader_qos()))
|
||||
.getNGLLogger("connext.replier"))
|
||||
, m_logger(NGL::getNGLLogger("connext.replier"))
|
||||
{
|
||||
}
|
||||
|
||||
@@ -501,3 +503,5 @@ private:
|
||||
};
|
||||
|
||||
} // namespace connext
|
||||
|
||||
#endif // BUILD_RTI
|
||||
Reference in new issue
Block a user