mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-05 17:35:34 +08:00
refs #402, post merge feedback by MS
This commit is contained in:
@@ -43,13 +43,6 @@ namespace BlackMisc
|
||||
//! Metadata
|
||||
static void registerMetadata();
|
||||
|
||||
protected:
|
||||
//! Myself
|
||||
virtual const CAircraftSituationList &container() const override { return *this; }
|
||||
|
||||
//! Myself
|
||||
virtual CAircraftSituationList &container() override { return *this; }
|
||||
|
||||
};
|
||||
} // namespace
|
||||
} // namespace
|
||||
|
||||
@@ -55,13 +55,6 @@ namespace BlackMisc
|
||||
//! Register metadata
|
||||
static void registerMetadata();
|
||||
|
||||
protected:
|
||||
//! Myself
|
||||
virtual const CAirportList &container() const override { return *this; }
|
||||
|
||||
//! Myself
|
||||
virtual CAirportList &container() override { return *this; }
|
||||
|
||||
};
|
||||
} //namespace
|
||||
} // namespace
|
||||
|
||||
@@ -24,6 +24,18 @@ namespace BlackMisc
|
||||
ICallsignObjectList<OBJ, CONTAINER>::ICallsignObjectList()
|
||||
{ }
|
||||
|
||||
template <class OBJ, class CONTAINER>
|
||||
const CONTAINER &ICallsignObjectList<OBJ, CONTAINER>::container() const
|
||||
{
|
||||
return static_cast<const CONTAINER &>(*this);
|
||||
}
|
||||
|
||||
template <class OBJ, class CONTAINER>
|
||||
CONTAINER &ICallsignObjectList<OBJ, CONTAINER>::container()
|
||||
{
|
||||
return static_cast<CONTAINER &>(*this);
|
||||
}
|
||||
|
||||
template <class OBJ, class CONTAINER>
|
||||
bool ICallsignObjectList<OBJ, CONTAINER>::containsCallsign(const CCallsign &callsign) const
|
||||
{
|
||||
|
||||
@@ -77,10 +77,10 @@ namespace BlackMisc
|
||||
ICallsignObjectList();
|
||||
|
||||
//! Container
|
||||
virtual const CONTAINER &container() const = 0;
|
||||
const CONTAINER &container() const;
|
||||
|
||||
//! Container
|
||||
virtual CONTAINER &container() = 0;
|
||||
CONTAINER &container();
|
||||
};
|
||||
|
||||
} //namespace
|
||||
|
||||
Reference in New Issue
Block a user