summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-07-06 23:15:07 +0200
committerLars Knoll <lars.knoll@qt.io>2020-08-24 00:17:04 +0200
commitd78df774853e594af100cf282b1df938b9e40c39 (patch)
tree1faf5bcfda817ef65989b06298bba4e12c4309e2 /src/corelib/kernel
parent6d95ffe996288796d53b64702409bbfab29cea67 (diff)
Clean up a custom void_t implementation
Change-Id: I30fcaef2a242cc2daee82d37debdb97e59a9a8f2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r--src/corelib/kernel/qmetatype.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index e404855860..b908fc3d25 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -814,15 +814,10 @@ struct ContainerCapabilitiesImpl<Container, decltype(std::declval<Container>().p
{ static_cast<Container *>(const_cast<void *>(container))->push_back(*static_cast<const typename Container::value_type *>(value)); }
};
-namespace QtPrivate {
-namespace ContainerCapabilitiesMetaProgrammingHelper {
- template<typename... Ts>
- using void_t = void;
-}
-}
-
template<typename Container>
-struct ContainerCapabilitiesImpl<Container, QtPrivate::ContainerCapabilitiesMetaProgrammingHelper::void_t<decltype(std::declval<Container>().insert(std::declval<typename Container::value_type>())), decltype(std::declval<typename Container::value_type>() == std::declval<typename Container::value_type>())>>
+struct ContainerCapabilitiesImpl<Container,
+ std::void_t<decltype(std::declval<Container>().insert(std::declval<typename Container::value_type>())),
+ decltype(std::declval<typename Container::value_type>() == std::declval<typename Container::value_type>())>>
{
enum {ContainerCapabilities = ContainerIsAppendable};