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
@@ -1,8 +1,42 @@
|
||||
#pragma once
|
||||
|
||||
// Stub header for BUILD_RTI=OFF
|
||||
// Original generic_logger.h uses NGL::INGLLogger from RTI infrastructure
|
||||
#ifdef BUILD_RTI
|
||||
// Real implementation with RTI NGL logger
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
#include <ddsgen_export.h>
|
||||
#include <string>
|
||||
|
||||
namespace DDS
|
||||
{
|
||||
|
||||
enum class DataType
|
||||
{
|
||||
DATA_TYPE_UNKNOWN = 0,
|
||||
|
||||
DATA_WRITER = 1,
|
||||
DATA_READER = 2,
|
||||
|
||||
DYNAMIC_DATA_WRITER = 3,
|
||||
DYNAMIC_DATA_READER = 4,
|
||||
|
||||
DATA_TOPIC_SERVER = 8,
|
||||
DATA_TOPIC_CLIENT = 9,
|
||||
|
||||
FUNCTION_TOPIC_SERVER = 12,
|
||||
FUNCTION_TOPIC_CLIENT = 13
|
||||
};
|
||||
|
||||
using LOGGER_T = NGL::INGLLogger&;
|
||||
|
||||
DDSGEN_EXPORT LOGGER_T getLogger(const char *name, DataType dt);
|
||||
inline LOGGER_T getLogger(const std::string &loggerName, DataType dt)
|
||||
{
|
||||
return getLogger(loggerName.data(), dt);
|
||||
}
|
||||
|
||||
} // namespace DDS
|
||||
#else
|
||||
// Stub header for BUILD_RTI=OFF
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
#include <ddsgen_export.h>
|
||||
#include <string>
|
||||
@@ -46,4 +80,5 @@ inline LOGGER_T getLogger(const std::string &loggerName, DataType dt)
|
||||
return getLogger(loggerName.data(), dt);
|
||||
}
|
||||
|
||||
} // namespace DDS
|
||||
} // namespace DDS
|
||||
#endif
|
||||
Reference in new issue
Block a user