Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts.
This commit is contained in:
12 files changed
+203
-144
No files matched your search
@@ -16,10 +16,11 @@
|
||||
// Use actual RTI Connext DDS types
|
||||
#include <dds/sub/LoanedSamples.hpp>
|
||||
#include <dds/sub/SampleInfo.hpp>
|
||||
// DataModification enum is provided by LtsUtilsCore/data_modification_enum.h
|
||||
// DataModification enum is provided by LtsUtilsCore/data_modification_enum.h (included above)
|
||||
#else
|
||||
// Stub für BUILD_RTI=OFF - keine RTI Connext DDS Verfügbarkeit
|
||||
// Diese Header ermöglicht Kompilierung ohne RTI DDS Dependencies
|
||||
// DataModification enum is still provided by LtsUtilsCore/data_modification_enum.h
|
||||
|
||||
// Forward declarations für DDS-Typen (Stubs)
|
||||
namespace dds {
|
||||
@@ -34,13 +35,6 @@ namespace sub {
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
// Stub enum for BUILD_RTI=OFF
|
||||
enum class DataModification {
|
||||
Added,
|
||||
Modified,
|
||||
Removed
|
||||
};
|
||||
#endif
|
||||
|
||||
namespace NGLLogger
|
||||
@@ -52,12 +46,8 @@ namespace DTC
|
||||
{
|
||||
class SubscriberListener;
|
||||
|
||||
// DataModification Enum aus LtsUtilsCore/data_modification_enum.h stub
|
||||
enum class DataModification {
|
||||
Added,
|
||||
Modified,
|
||||
Removed
|
||||
};
|
||||
// DataModification Enum is provided by LtsUtilsCore/data_modification_enum.h
|
||||
// Do NOT redefine here - use the one from LtsUtilsCore
|
||||
|
||||
// uses DRO (static)
|
||||
template <typename DRO_OBJECT, typename SC>
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
#include <DDS/Generic/generic_data_reader.h>
|
||||
#include <DDS/Generic/subscriber_listener.h>
|
||||
#include <DDS/Generic/generic_logger.h>
|
||||
#include <QTimer>
|
||||
|
||||
#include <dds/core/cond/StatusCondition.hpp>
|
||||
|
||||
Reference in new issue
Block a user