feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

PointerAlgorithm: Fix take and takeDefault

Browse Source 
Fix take unit tests to actually test the correct template instance,
add more unit tests for takeDefault.

Change-Id: I51f5b17b6478a8c1388a91840edfb9c702697b28
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2018-03-15 13:00:05 +01:00
parent 805b28b8b7
commit 3ef6f35cf6
2 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/pointeralgorithm.h
View File

@@ -275,7 +275,7 @@ auto toRawPointer(const SourceContainer &sources)
// take:
/////////////////
template<typename C>
Q_REQUIRED_RESULT Utils::optional<ValueType<C>> take(C &container, ValueType<C> *p)
Q_REQUIRED_RESULT Utils::optional<ValueType<C>> take(C &container, PointerType<C> p)
{
return take(container, [p](const ValueType<C> &v) { return v.get() == p; });
}
@@ -283,23 +283,23 @@ Q_REQUIRED_RESULT Utils::optional<ValueType<C>> take(C &container, ValueType<C>
template <typename C>
Q_REQUIRED_RESULT Utils::optional<ValueType<C>> take(C &container, std::nullptr_t)
{
return take(container, static_cast<ValueType<C> *>(nullptr));
return take(container, static_cast<PointerType<C>>(nullptr));
}
//////////////////
// takeOrDefault:
/////////////////
template<typename C>
Q_REQUIRED_RESULT ValueType<C> takeOrDefault(C &container, ValueType<C> *p)
Q_REQUIRED_RESULT ValueType<C> takeOrDefault(C &container, PointerType<C> p)
{
auto result = take(container, [p](const ValueType<C> &v) { return v.get() == p; });
return bool(result) ? result.value() : Utils::make_optional<ValueType<C>>(nullptr);
return bool(result) ? std::move(result.value()) : std::move(ValueType<C>());
}
template <typename C>
Q_REQUIRED_RESULT ValueType<C> takeOrDefault(C &container, std::nullptr_t)
{
return takeOrDefault(container, static_cast<ValueType<C> *>(nullptr));
return takeOrDefault(container, static_cast<PointerType<C>>(nullptr));
}
} // namespace Utils