AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use std::void_t instead of the hand-rolled version

Browse Source 
Change-Id: Ibcf0e3d32f05b95f5f1996a071a50bc0eba1ae61
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Giuseppe D'Angelo 2020-10-16 20:09:56 +02:00
parent 263b29eedb
commit c2d250fd1c
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/corelib/tools/qcontainertools_impl.h
View File

@ -106,11 +106,7 @@ void reserveIfForwardIterator(Container *c, ForwardIterator f, ForwardIterator l
c->reserve(static_cast<typename Container::size_type>(std::distance(f, l)));
}
// for detecting expression validity
template <typename ... T>
using void_t = void;
template <typename Iterator, typename = void_t<>>
template <typename Iterator, typename = std::void_t<>>
struct AssociativeIteratorHasKeyAndValue : std::false_type
{
};
@ -118,14 +114,14 @@ struct AssociativeIteratorHasKeyAndValue : std::false_type
template <typename Iterator>
struct AssociativeIteratorHasKeyAndValue<
Iterator,
void_t<decltype(std::declval<Iterator &>().key()),
decltype(std::declval<Iterator &>().value())>
std::void_t<decltype(std::declval<Iterator &>().key()),
decltype(std::declval<Iterator &>().value())>
>
: std::true_type
{
};
template <typename Iterator, typename = void_t<>, typename = void_t<>>
template <typename Iterator, typename = std::void_t<>, typename = std::void_t<>>
struct AssociativeIteratorHasFirstAndSecond : std::false_type
{
};
@ -133,8 +129,8 @@ struct AssociativeIteratorHasFirstAndSecond : std::false_type
template <typename Iterator>
struct AssociativeIteratorHasFirstAndSecond<
Iterator,
void_t<decltype(std::declval<Iterator &>()->first),
decltype(std::declval<Iterator &>()->second)>
std::void_t<decltype(std::declval<Iterator &>()->first),
decltype(std::declval<Iterator &>()->second)>
>
: std::true_type
{