LtsSession-STUB und GuezNasat-Fixes für BUILD_RTI=OFF
- CMakeLists.txt: Conditional compilation für BUILD_RTI=ON/OFF - lts_session_stub.h/cpp: NEU - STUB-Implementation ohne RTI-Abhängigkeit - lts_session_data_dds_stub.h: Doppeltes Namespace-Closing entfernt - gna_nasat_aircraft.h: participantId zu participantIdValue umbenannt (Konflikt) - gna_dtc.h: Doppeldefinitionen entfernt - gna_nasat_aircraft_participant.h: Doppeldefinitionen entfernt - ppm_enums.hpp: DataModification-Enum im ParticipantManagement-Namespace - ElevationMap-STUB: ArcGIS-Abhängigkeit für BUILD_RTI=OFF gekapselt - Viewer-STUB: Header für BUILD_RTI=OFF Build Build-Validierung: Configure erfolgreich, LtsSession-Fehler behoben
This commit is contained in:
17 files changed
+543
-50
No files matched your search
@@ -24,10 +24,10 @@ struct GNACOMMON_EXPORT NasatAircraftParticipant
|
||||
int id = 0;
|
||||
int nasatAircraftId = 0;
|
||||
int exerciseId = 0;
|
||||
int participantId = 0;
|
||||
int participantIdValue = 0;
|
||||
|
||||
// Helper method für Kompatibilität
|
||||
int participantId() const { return participantId; }
|
||||
int participantId() const { return participantIdValue; }
|
||||
};
|
||||
|
||||
} // namespace GuezNasat
|
||||
@@ -45,6 +45,6 @@ inline std::ostream& operator<<(std::ostream& os, const GuezNasat::NasatAircraft
|
||||
{
|
||||
os << "NasatAircraftParticipant{id=" << participant.id
|
||||
<< ", nasatAircraftId=" << participant.nasatAircraftId
|
||||
<< ", participantId=" << participant.participantId << "}";
|
||||
<< ", participantId=" << participant.participantIdValue << "}";
|
||||
return os;
|
||||
}
|
||||
Reference in new issue
Block a user