refs #395, post merge and rebase adjustments plus further testing fixes:

* adjusted iterim position updates
* removed deadlocks (thread safe values in airspace monitor)
* resolved some merge issues
* some smaller fixes in airspace monitor (style, finders)
This commit is contained in:
Klaus Basan
2015-04-25 01:36:24 +02:00
committed by Mathew Sutcliffe
parent 6debd33b4f
commit 085edc82cb
5 changed files with 115 additions and 121 deletions

View File

@@ -81,7 +81,7 @@ namespace BlackCore
virtual void sendIcaoCodesQuery(const BlackMisc::Aviation::CCallsign &callsign) override;
virtual void sendFrequencyQuery(const BlackMisc::Aviation::CCallsign &callsign) override;
virtual void sendUserInfoQuery(const BlackMisc::Aviation::CCallsign &callsign) override;
virtual void sendInterimPosition(const BlackMisc::Aviation::CCallsignSet &receiver) override;
virtual void sendInterimPositions(const BlackMisc::Aviation::CCallsignSet &receiver) override;
//! @}
//! \name Weather slots