wt/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-11-11 16:40:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Keep astyle from padding the create_object_with_comparator templates

Browse Source 
Spell the negated condition as detail::negation<...> instead of a leading
'!', which made astyle spread the template header out.

Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
Niels Lohmann committed 2026-09-30 18:17:33 +02:00
1 parent 6be8c2e986
commit 4eb8618d16
2 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/nlohmann/json.hpp
+4 -4
View File
@@ -1134,15 +1134,15 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
/// types, such as nlohmann::ordered_map, fall back to the plain range /// types, such as nlohmann::ordered_map, fall back to the plain range
/// constructor and default-construct their comparator, just as they /// constructor and default-construct their comparator, just as they
/// always have (@ref detail::is_comparator_constructible_object_type). /// always have (@ref detail::is_comparator_constructible_object_type).
template < typename Iterator, detail::enable_if_t < template<typename Iterator, detail::enable_if_t<
detail::is_comparator_constructible_object_type<object_t, Iterator>::value, int > = 0 > detail::is_comparator_constructible_object_type<object_t, Iterator>::value, int> = 0>
static object_t* create_object_with_comparator(const object_t& src_object, Iterator first, Iterator last) static object_t* create_object_with_comparator(const object_t& src_object, Iterator first, Iterator last)
{ {
return create<object_t>(first, last, src_object.key_comp()); return create<object_t>(first, last, src_object.key_comp());
} }
template < typename Iterator, detail::enable_if_t < template<typename Iterator, detail::enable_if_t<
!detail::is_comparator_constructible_object_type<object_t, Iterator>::value, int > = 0 > detail::negation<detail::is_comparator_constructible_object_type<object_t, Iterator>>::value, int> = 0>
static object_t* create_object_with_comparator(const object_t& /*src_object*/, Iterator first, Iterator last) static object_t* create_object_with_comparator(const object_t& /*src_object*/, Iterator first, Iterator last)
{ {
return create<object_t>(first, last); return create<object_t>(first, last);
single_include/nlohmann/json.hpp
+4 -4
View File
@@ -27246,15 +27246,15 @@ class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-spec
/// types, such as nlohmann::ordered_map, fall back to the plain range /// types, such as nlohmann::ordered_map, fall back to the plain range
/// constructor and default-construct their comparator, just as they /// constructor and default-construct their comparator, just as they
/// always have (@ref detail::is_comparator_constructible_object_type). /// always have (@ref detail::is_comparator_constructible_object_type).
template < typename Iterator, detail::enable_if_t < template<typename Iterator, detail::enable_if_t<
detail::is_comparator_constructible_object_type<object_t, Iterator>::value, int > = 0 > detail::is_comparator_constructible_object_type<object_t, Iterator>::value, int> = 0>
static object_t* create_object_with_comparator(const object_t& src_object, Iterator first, Iterator last) static object_t* create_object_with_comparator(const object_t& src_object, Iterator first, Iterator last)
{ {
return create<object_t>(first, last, src_object.key_comp()); return create<object_t>(first, last, src_object.key_comp());
} }
template < typename Iterator, detail::enable_if_t < template<typename Iterator, detail::enable_if_t<
!detail::is_comparator_constructible_object_type<object_t, Iterator>::value, int > = 0 > detail::negation<detail::is_comparator_constructible_object_type<object_t, Iterator>>::value, int> = 0>
static object_t* create_object_with_comparator(const object_t& /*src_object*/, Iterator first, Iterator last) static object_t* create_object_with_comparator(const object_t& /*src_object*/, Iterator first, Iterator last)
{ {
return create<object_t>(first, last); return create<object_t>(first, last);