amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-09-30 19:50:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid astyle's padding in ordered_map::emplace's template headers

Browse Source 
Use detail::conjunction instead of && and drop the redundant V&& in detail::is_constructible, so astyle keeps the usual template formatting. Addresses review comment by @gregmarr.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann
2026-09-30 07:33:11 +02:00
parent 989b8ed841
commit 1daad8efe0
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nlohmann/ordered_map.hpp
+5 -5
View File
@@ -70,8 +70,8 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
return *this;
}
template < class V, detail::enable_if_t <
detail::is_constructible < T, V&& >::value, int > = 0 >
template<class V, detail::enable_if_t<
detail::is_constructible<T, V>::value, int> = 0>
std::pair<iterator, bool> emplace(const key_type& key, V && t)
{
for (auto it = this->begin(); it != this->end(); ++it)
@@ -85,9 +85,9 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
return {std::prev(this->end()), true};
}
template < class KeyType, class V, detail::enable_if_t <
detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value&&
detail::is_constructible < T, V&& >::value, int > = 0 >
template<class KeyType, class V, detail::enable_if_t<
detail::conjunction<detail::is_usable_as_key_type<key_compare, key_type, KeyType>,
detail::is_constructible<T, V>>::value, int> = 0>
std::pair<iterator, bool> emplace(KeyType && key, V && t)
{
for (auto it = this->begin(); it != this->end(); ++it)
single_include/nlohmann/json.hpp
+5 -5
View File
@@ -25832,8 +25832,8 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
return *this;
}
template < class V, detail::enable_if_t <
detail::is_constructible < T, V&& >::value, int > = 0 >
template<class V, detail::enable_if_t<
detail::is_constructible<T, V>::value, int> = 0>
std::pair<iterator, bool> emplace(const key_type& key, V && t)
{
for (auto it = this->begin(); it != this->end(); ++it)
@@ -25847,9 +25847,9 @@ template <class Key, class T, class IgnoredLess = std::less<Key>,
return {std::prev(this->end()), true};
}
template < class KeyType, class V, detail::enable_if_t <
detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value&&
detail::is_constructible < T, V&& >::value, int > = 0 >
template<class KeyType, class V, detail::enable_if_t<
detail::conjunction<detail::is_usable_as_key_type<key_compare, key_type, KeyType>,
detail::is_constructible<T, V>>::value, int> = 0>
std::pair<iterator, bool> emplace(KeyType && key, V && t)
{
for (auto it = this->begin(); it != this->end(); ++it)