flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-03 15:45:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #413 Removed one overload of CRange::findBy and one of CSequence::applyIf; they were never used and they caused a circular dependency.

Browse Source 
Templatized another overload of applyIf to break a circular dependency.
This commit is contained in:
Mathew Sutcliffe
2015-05-04 14:43:20 +01:00
parent aeb95ebb30
commit 36d116b4e9
5 changed files with 7 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/blackmisc/sequence.h
View File

@@ -352,8 +352,8 @@ namespace BlackMisc
* \brief Modify by applying a value map to each element for which a given predicate returns true.
* \return The number of elements modified.
*/
template <class Predicate>
int applyIf(Predicate p, const CPropertyIndexVariantMap &newValues, bool skipEqualValues = false)
template <class Predicate, class VariantMap>
int applyIf(Predicate p, const VariantMap &newValues, bool skipEqualValues = false)
{
int count = 0;
for (auto &value : *this)
@@ -371,21 +371,12 @@ namespace BlackMisc
* \param skipEqualValues Equal values will not be updated
* \return The number of elements modified.
*/
template <class K1, class V1>
int applyIf(K1 key1, V1 value1, const CPropertyIndexVariantMap &newValues, bool skipEqualValues = false)
template <class K1, class V1, class VariantMap>
int applyIf(K1 key1, V1 value1, const VariantMap &newValues, bool skipEqualValues = false)
{
return applyIf(BlackMisc::Predicates::MemberEqual(key1, value1), newValues, skipEqualValues);
}
/*!
* \brief Modify by applying a value map to each element matching a given value map.
* \return The number of elements modified.
*/
int applyIf(const CPropertyIndexVariantMap &pattern, const CPropertyIndexVariantMap &newValues, bool skipEqualValues = false)
{
return applyIf([ & ](const T & value) { return value == pattern; }, newValues, skipEqualValues);
}
/*!
* \brief Remove all elements equal to the given object, if it is contained.
* \pre The sequence must be initialized.