From f660fedcaba5349aa78222f3e49eec44272a7caf Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Thu, 15 Oct 2020 14:42:09 +0200
Subject: qcontainerinfo: make variable templates inline

Change-Id: I09d51f0a04a6dc12915ba6ad0b77af074238988d
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 src/corelib/global/qcontainerinfo.h | 148 ++++++++++++++++++------------------
 1 file changed, 74 insertions(+), 74 deletions(-)

(limited to 'src/corelib')

diff --git a/src/corelib/global/qcontainerinfo.h b/src/corelib/global/qcontainerinfo.h
index e0025fcef0..99a674fc71 100644
--- a/src/corelib/global/qcontainerinfo.h
+++ b/src/corelib/global/qcontainerinfo.h
@@ -68,189 +68,189 @@ QT_WARNING_PUSH
 QT_WARNING_DISABLE_CLANG("-Wunused-const-variable")
 
 template<typename C, typename = void>
-constexpr bool has_value_type_v = false;
+inline constexpr bool has_value_type_v = false;
 template<typename C>
-constexpr bool has_value_type_v<C, std::void_t<value_type<C>>> = true;
+inline constexpr bool has_value_type_v<C, std::void_t<value_type<C>>> = true;
 
 template<typename C, typename = void>
-constexpr bool has_key_type_v = false;
+inline constexpr bool has_key_type_v = false;
 template<typename C>
-constexpr bool has_key_type_v<C, std::void_t<key_type<C>>> = true;
+inline constexpr bool has_key_type_v<C, std::void_t<key_type<C>>> = true;
 
 template<typename C, typename = void>
-constexpr bool has_mapped_type_v = false;
+inline constexpr bool has_mapped_type_v = false;
 template<typename C>
-constexpr bool has_mapped_type_v<C, std::void_t<mapped_type<C>>> = true;
+inline constexpr bool has_mapped_type_v<C, std::void_t<mapped_type<C>>> = true;
 
 template<typename C, typename = void>
-constexpr bool has_size_v = false;
+inline constexpr bool has_size_v = false;
 template<typename C>
-constexpr bool has_size_v<C, std::void_t<decltype(C().size())>> = true;
+inline constexpr bool has_size_v<C, std::void_t<decltype(C().size())>> = true;
 
 template<typename C, typename = void>
-constexpr bool has_clear_v = false;
+inline constexpr bool has_clear_v = false;
 template<typename C>
-constexpr bool has_clear_v<C, std::void_t<decltype(C().clear())>> = true;
+inline constexpr bool has_clear_v<C, std::void_t<decltype(C().clear())>> = true;
 
 template<typename, typename = void>
-constexpr bool has_at_index_v = false;
+inline constexpr bool has_at_index_v = false;
 template<typename C>
-constexpr bool has_at_index_v<C, std::void_t<decltype(C().at(0))>> = true;
+inline constexpr bool has_at_index_v<C, std::void_t<decltype(C().at(0))>> = true;
 
 template<typename, typename = void>
-constexpr bool has_at_key_v = false;
+inline constexpr bool has_at_key_v = false;
 template<typename C>
-constexpr bool has_at_key_v<C, std::void_t<decltype(C().at(key_type<C>()))>> = true;
+inline constexpr bool has_at_key_v<C, std::void_t<decltype(C().at(key_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_get_at_index_v = false;
+inline constexpr bool can_get_at_index_v = false;
 template<typename C>
-constexpr bool can_get_at_index_v<C, std::void_t<value_type<C>(decltype(C()[0]))>> = true;
+inline constexpr bool can_get_at_index_v<C, std::void_t<value_type<C>(decltype(C()[0]))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_set_at_index_v = false;
+inline constexpr bool can_set_at_index_v = false;
 template<typename C>
-constexpr bool can_set_at_index_v<C, std::void_t<decltype(C()[0] = value_type<C>())>> = true;
+inline constexpr bool can_set_at_index_v<C, std::void_t<decltype(C()[0] = value_type<C>())>> = true;
 
 template<typename, typename = void>
-constexpr bool has_push_front_v = false;
+inline constexpr bool has_push_front_v = false;
 template<typename C>
-constexpr bool has_push_front_v<C, std::void_t<decltype(C().push_front(value_type<C>()))>> = true;
+inline constexpr bool has_push_front_v<C, std::void_t<decltype(C().push_front(value_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool has_push_back_v = false;
+inline constexpr bool has_push_back_v = false;
 template<typename C>
-constexpr bool has_push_back_v<C, std::void_t<decltype(C().push_back(value_type<C>()))>> = true;
+inline constexpr bool has_push_back_v<C, std::void_t<decltype(C().push_back(value_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool has_insert_v = false;
+inline constexpr bool has_insert_v = false;
 template<typename C>
-constexpr bool has_insert_v<C, std::void_t<decltype(C().insert(value_type<C>()))>> = true;
+inline constexpr bool has_insert_v<C, std::void_t<decltype(C().insert(value_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool has_pop_front_v = false;
+inline constexpr bool has_pop_front_v = false;
 template<typename C>
-constexpr bool has_pop_front_v<C, std::void_t<decltype(C().pop_front())>> = true;
+inline constexpr bool has_pop_front_v<C, std::void_t<decltype(C().pop_front())>> = true;
 
 template<typename, typename = void>
-constexpr bool has_pop_back_v = false;
+inline constexpr bool has_pop_back_v = false;
 template<typename C>
-constexpr bool has_pop_back_v<C, std::void_t<decltype(C().pop_back())>> = true;
+inline constexpr bool has_pop_back_v<C, std::void_t<decltype(C().pop_back())>> = true;
 
 template<typename, typename = void>
-constexpr bool has_iterator_v = false;
+inline constexpr bool has_iterator_v = false;
 template<typename C>
-constexpr bool has_iterator_v<C, std::void_t<iterator<C>>> = true;
+inline constexpr bool has_iterator_v<C, std::void_t<iterator<C>>> = true;
 
 template<typename, typename = void>
-constexpr bool has_const_iterator_v = false;
+inline constexpr bool has_const_iterator_v = false;
 template<typename C>
-constexpr bool has_const_iterator_v<C, std::void_t<const_iterator<C>>> = true;
+inline constexpr bool has_const_iterator_v<C, std::void_t<const_iterator<C>>> = true;
 
 template<typename, typename = void>
-constexpr bool can_set_value_at_iterator_v = false;
+inline constexpr bool can_set_value_at_iterator_v = false;
 template<typename C>
-constexpr bool can_set_value_at_iterator_v<C, std::void_t<decltype(*C().begin() = value_type<C>())>> = true;
+inline constexpr bool can_set_value_at_iterator_v<C, std::void_t<decltype(*C().begin() = value_type<C>())>> = true;
 
 template<typename, typename = void>
-constexpr bool can_set_mapped_at_iterator_v = false;
+inline constexpr bool can_set_mapped_at_iterator_v = false;
 template<typename C>
-constexpr bool can_set_mapped_at_iterator_v<C, std::void_t<decltype(*C().begin() = mapped_type<C>())>> = true;
+inline constexpr bool can_set_mapped_at_iterator_v<C, std::void_t<decltype(*C().begin() = mapped_type<C>())>> = true;
 
 template<typename, typename = void>
-constexpr bool can_insert_value_at_iterator_v = false;
+inline constexpr bool can_insert_value_at_iterator_v = false;
 template<typename C>
-constexpr bool can_insert_value_at_iterator_v<C, std::void_t<decltype(C().insert(C().begin(), value_type<C>()))>> = true;
+inline constexpr bool can_insert_value_at_iterator_v<C, std::void_t<decltype(C().insert(C().begin(), value_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_erase_at_iterator_v = false;
+inline constexpr bool can_erase_at_iterator_v = false;
 template<typename C>
-constexpr bool can_erase_at_iterator_v<C, std::void_t<decltype(C().erase(C().begin()))>> = true;
+inline constexpr bool can_erase_at_iterator_v<C, std::void_t<decltype(C().erase(C().begin()))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_erase_range_at_iterator_v = false;
+inline constexpr bool can_erase_range_at_iterator_v = false;
 template<typename C>
-constexpr bool can_erase_range_at_iterator_v<C, std::void_t<decltype(C().erase(C().begin(), C().end()))>> = true;
+inline constexpr bool can_erase_range_at_iterator_v<C, std::void_t<decltype(C().erase(C().begin(), C().end()))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_get_at_key_v = false;
+inline constexpr bool can_get_at_key_v = false;
 template<typename C>
-constexpr bool can_get_at_key_v<C, std::void_t<mapped_type<C>(decltype(C()[key_type<C>()]))>> = true;
+inline constexpr bool can_get_at_key_v<C, std::void_t<mapped_type<C>(decltype(C()[key_type<C>()]))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_set_at_key_v = false;
+inline constexpr bool can_set_at_key_v = false;
 template<typename C>
-constexpr bool can_set_at_key_v<C, std::void_t<decltype(C()[key_type<C>()] = mapped_type<C>())>> = true;
+inline constexpr bool can_set_at_key_v<C, std::void_t<decltype(C()[key_type<C>()] = mapped_type<C>())>> = true;
 
 template<typename, typename = void>
-constexpr bool can_erase_at_key_v = false;
+inline constexpr bool can_erase_at_key_v = false;
 template<typename C>
-constexpr bool can_erase_at_key_v<C, std::void_t<decltype(C().erase(key_type<C>()))>> = true;
+inline constexpr bool can_erase_at_key_v<C, std::void_t<decltype(C().erase(key_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_remove_at_key_v = false;
+inline constexpr bool can_remove_at_key_v = false;
 template<typename C>
-constexpr bool can_remove_at_key_v<C, std::void_t<decltype(C().remove(key_type<C>()))>> = true;
+inline constexpr bool can_remove_at_key_v<C, std::void_t<decltype(C().remove(key_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_insert_key_v = false;
+inline constexpr bool can_insert_key_v = false;
 template<typename C>
-constexpr bool can_insert_key_v<C, std::void_t<decltype(C().insert(key_type<C>()))>> = true;
+inline constexpr bool can_insert_key_v<C, std::void_t<decltype(C().insert(key_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_insert_pair_v = false;
+inline constexpr bool can_insert_pair_v = false;
 template<typename C>
-constexpr bool can_insert_pair_v<C, std::void_t<decltype(C().insert({key_type<C>(), mapped_type<C>()}))>> = true;
+inline constexpr bool can_insert_pair_v<C, std::void_t<decltype(C().insert({key_type<C>(), mapped_type<C>()}))>> = true;
 
 template<typename, typename = void>
-constexpr bool can_insert_key_mapped_v = false;
+inline constexpr bool can_insert_key_mapped_v = false;
 template<typename C>
-constexpr bool can_insert_key_mapped_v<C, std::void_t<decltype(C().insert(key_type<C>(), mapped_type<C>()))>> = true;
+inline constexpr bool can_insert_key_mapped_v<C, std::void_t<decltype(C().insert(key_type<C>(), mapped_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool has_contains_v = false;
+inline constexpr bool has_contains_v = false;
 template<typename C>
-constexpr bool has_contains_v<C, std::void_t<decltype(bool(C().contains(key_type<C>())))>> = true;
+inline constexpr bool has_contains_v<C, std::void_t<decltype(bool(C().contains(key_type<C>())))>> = true;
 
 template<typename, typename = void>
-constexpr bool has_find_v = false;
+inline constexpr bool has_find_v = false;
 template<typename C>
-constexpr bool has_find_v<C, std::void_t<decltype(C().find(key_type<C>()))>> = true;
+inline constexpr bool has_find_v<C, std::void_t<decltype(C().find(key_type<C>()))>> = true;
 
 template<typename, typename = void>
-constexpr bool iterator_dereferences_to_value_v = false;
+inline constexpr bool iterator_dereferences_to_value_v = false;
 template<typename C>
-constexpr bool iterator_dereferences_to_value_v<C, std::void_t<decltype(value_type<C>(*C().begin()))>> = true;
+inline constexpr bool iterator_dereferences_to_value_v<C, std::void_t<decltype(value_type<C>(*C().begin()))>> = true;
 
 template<typename, typename = void>
-constexpr bool iterator_has_key_v = false;
+inline constexpr bool iterator_has_key_v = false;
 template<typename C>
-constexpr bool iterator_has_key_v<C, std::void_t<decltype(key_type<C>(C().begin().key()))>> = true;
+inline constexpr bool iterator_has_key_v<C, std::void_t<decltype(key_type<C>(C().begin().key()))>> = true;
 
 template<typename, typename = void>
-constexpr bool value_type_has_first_v = false;
+inline constexpr bool value_type_has_first_v = false;
 template<typename C>
-constexpr bool value_type_has_first_v<C, std::void_t<decltype(key_type<C>(value_type<C>().first))>> = true;
+inline constexpr bool value_type_has_first_v<C, std::void_t<decltype(key_type<C>(value_type<C>().first))>> = true;
 
 template<typename, typename = void>
-constexpr bool iterator_dereferences_to_key_v = false;
+inline constexpr bool iterator_dereferences_to_key_v = false;
 template<typename C>
-constexpr bool iterator_dereferences_to_key_v<C, std::void_t<decltype(key_type<C>(*C().begin()))>> = true;
+inline constexpr bool iterator_dereferences_to_key_v<C, std::void_t<decltype(key_type<C>(*C().begin()))>> = true;
 
 template<typename, typename = void>
-constexpr bool iterator_has_value_v = false;
+inline constexpr bool iterator_has_value_v = false;
 template<typename C>
-constexpr bool iterator_has_value_v<C, std::void_t<decltype(mapped_type<C>(C().begin().value()))>> = true;
+inline constexpr bool iterator_has_value_v<C, std::void_t<decltype(mapped_type<C>(C().begin().value()))>> = true;
 
 template<typename, typename = void>
-constexpr bool value_type_has_second_v = false;
+inline constexpr bool value_type_has_second_v = false;
 template<typename C>
-constexpr bool value_type_has_second_v<C, std::void_t<decltype(mapped_type<C>(value_type<C>().second))>> = true;
+inline constexpr bool value_type_has_second_v<C, std::void_t<decltype(mapped_type<C>(value_type<C>().second))>> = true;
 
 template<typename, typename = void>
-constexpr bool iterator_dereferences_to_mapped_v = false;
+inline constexpr bool iterator_dereferences_to_mapped_v = false;
 template<typename C>
-constexpr bool iterator_dereferences_to_mapped_v<C, std::void_t<decltype(mapped_type<C>(*C().begin()))>> = true;
+inline constexpr bool iterator_dereferences_to_mapped_v<C, std::void_t<decltype(mapped_type<C>(*C().begin()))>> = true;
 
 QT_WARNING_POP
 
-- 
cgit v1.2.3