refs #402, post merge feedback by MS

This commit is contained in:
Klaus Basan
2015-04-09 13:59:40 +02:00
parent e7c8c28252
commit aafee8eafd
31 changed files with 105 additions and 119 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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
{

View File

@@ -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