Removes .IDL warnings: multiple enum definitons and builtin-type collisions
This commit is contained in:
135 files changed
+1122
-1122
No files matched your search
+1
-1
@@ -108,7 +108,7 @@ bool AlarmToMap::isElapsed(const Sim2SituationMap::DDS_T &data) const
|
||||
|
||||
|
||||
|
||||
if (data.eventType().underlying() != ProjectDataManagement::EventType_def::EmergencyCall)
|
||||
if (data.eventType().underlying() != ProjectDataManagement::PdmEventType_def::EmergencyCall)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
|
||||
+4
-4
@@ -518,12 +518,12 @@ AreaEffectSimulation::AesType EffectCluster2SituationMap::aesTypeFromGearClassCh
|
||||
const ProjectDataManagement::GearClass &gc = m_pdmHandler->gearClassFromChargeTypeId(data.chargeStruct().chargeTypeId());
|
||||
switch (gc.underlying())
|
||||
{
|
||||
case ProjectDataManagement::GearClass::AirSupport:
|
||||
case ProjectDataManagement::GearClass::GearClass_AirSupport:
|
||||
s_aesTypeMap[data.chargeStruct().chargeTypeId()] = AreaEffectSimulation::AesType::AtAirSupportImpact;
|
||||
break;
|
||||
case ProjectDataManagement::GearClass::Artillery:
|
||||
case ProjectDataManagement::GearClass::Mortar:
|
||||
case ProjectDataManagement::GearClass::Rocket:
|
||||
case ProjectDataManagement::GearClass::GearClass_Artillery:
|
||||
case ProjectDataManagement::GearClass::GearClass_Mortar:
|
||||
case ProjectDataManagement::GearClass::GearClass_Rocket:
|
||||
s_aesTypeMap[data.chargeStruct().chargeTypeId()] = AreaEffectSimulation::AesType::AtExplosionArea;
|
||||
break;
|
||||
default:
|
||||
|
||||
+4
-4
@@ -920,12 +920,12 @@ AreaEffectSimulation::AesType ExplosionCluster2SituationMap::aesTypeFromGearClas
|
||||
const ProjectDataManagement::GearClass &gc = m_pdmHandler->gearClassFromChargeTypeId(data.chargeStruct().chargeTypeId());
|
||||
switch (gc.underlying())
|
||||
{
|
||||
case ProjectDataManagement::GearClass::AirSupport:
|
||||
case ProjectDataManagement::GearClass::GearClass_AirSupport:
|
||||
s_aesTypeMap[data.chargeStruct().chargeTypeId()] = AreaEffectSimulation::AesType::AtAirSupportImpact;
|
||||
break;
|
||||
case ProjectDataManagement::GearClass::Artillery:
|
||||
case ProjectDataManagement::GearClass::Mortar:
|
||||
case ProjectDataManagement::GearClass::Rocket:
|
||||
case ProjectDataManagement::GearClass::GearClass_Artillery:
|
||||
case ProjectDataManagement::GearClass::GearClass_Mortar:
|
||||
case ProjectDataManagement::GearClass::GearClass_Rocket:
|
||||
s_aesTypeMap[data.chargeStruct().chargeTypeId()] = AreaEffectSimulation::AesType::AtExplosionArea;
|
||||
break;
|
||||
default:
|
||||
|
||||
Reference in new issue
Block a user