Ref T482 Enable makeKeysRange and makePairsRange for non-const lvalues.

This commit is contained in:
Mat Sutcliffe
2018-12-25 16:07:49 +00:00
parent e625c67005
commit 3b07618830

View File

@@ -325,11 +325,19 @@ namespace BlackMisc
*
* This is more efficient than the keys() method of the container, as it doesn't allocate memory.
*/
//! @{
template <class T>
auto makeKeysRange(const T &container)
{
return makeRange(container.keyBegin(), container.keyEnd());
}
template <class T>
void makeKeysRange(T &container)
{
container.detach(); // http://doc.qt.io/qt-5/containers.html#implicit-sharing-iterator-problem
return makeRange(container.keyValueBegin(), container.keyValueEnd());
}
//! @}
/*!
* Returns a const CRange for iterating over the keys and values of a Qt associative container.
@@ -338,19 +346,19 @@ namespace BlackMisc
* This is more efficient than using the keys() method of the container and thereafter looking up each key,
* as it neither allocates memory, nor performs any key lookups.
*/
//! @{
template <class T>
auto makePairsRange(const T &container)
{
return makeRange(container.keyValueBegin(), container.keyValueEnd());
}
/*!
* Keys range for a non-const lvalue would be unsafe due to iterator invalidation on detach().
*
* \see http://doc.qt.io/qt-5/containers.html#implicit-sharing-iterator-problem
*/
template <class T>
void makeKeysRange(T &container) = delete;
auto makePairsRange(T &container)
{
container.detach(); // http://doc.qt.io/qt-5/containers.html#implicit-sharing-iterator-problem
return makeRange(container.keyValueBegin(), container.keyValueEnd());
}
//! @}
/*!
* Keys range for a temporary would be unsafe.
@@ -358,14 +366,6 @@ namespace BlackMisc
template <class T>
void makeKeysRange(const T &&container) = delete;
/*!
* Pairs range for a non-const lvalue would be unsafe due to iterator invalidation on detach().
*
* \see http://doc.qt.io/qt-5/containers.html#implicit-sharing-iterator-problem
*/
template <class T>
void makePairsRange(T &container) = delete;
/*!
* Pairs range for a temporary would be unsafe.
*/