From 5b57c36337ae65876e52273a66681f7fb9e6531c Mon Sep 17 00:00:00 2001 From: Jonas Hahnfeld Date: Fri, 23 May 2025 10:53:17 +0200 Subject: [PATCH 1/2] Fix sorting of nested unordered_multiset The outer container must be sorted, as already done for nested unordered_set. --- types/unordered_multiset/nested/read.C | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/types/unordered_multiset/nested/read.C b/types/unordered_multiset/nested/read.C index 1180744..3ea1637 100644 --- a/types/unordered_multiset/nested/read.C +++ b/types/unordered_multiset/nested/read.C @@ -32,7 +32,9 @@ static void PrintNestedUnorderedMultisetValue(const REntry &entry, std::vector innerSorted(inner.begin(), inner.end()); std::sort(innerSorted.begin(), innerSorted.end()); valueSorted.push_back(innerSorted); -} + } + + std::sort(valueSorted.begin(), valueSorted.end()); os << " \"" << name << "\": ["; bool outerFirst = true; From 184e4847c87442e54d88738d417acb76abee2211 Mon Sep 17 00:00:00 2001 From: Jonas Hahnfeld Date: Fri, 23 May 2025 10:54:44 +0200 Subject: [PATCH 2/2] Remove unused variable in nested unordered_[multi]set We sort the final container valueSorted at the end. --- types/unordered_multiset/nested/read.C | 2 -- types/unordered_set/nested/read.C | 2 -- 2 files changed, 4 deletions(-) diff --git a/types/unordered_multiset/nested/read.C b/types/unordered_multiset/nested/read.C index 3ea1637..36de48b 100644 --- a/types/unordered_multiset/nested/read.C +++ b/types/unordered_multiset/nested/read.C @@ -23,8 +23,6 @@ static void PrintNestedUnorderedMultisetValue(const REntry &entry, bool last = false) { UnorderedMultiset &value = *entry.GetPtr(name); - std::vector valueInnerSorted(value.begin(), - value.end()); std::vector> valueSorted; diff --git a/types/unordered_set/nested/read.C b/types/unordered_set/nested/read.C index 82ebc43..65f0361 100644 --- a/types/unordered_set/nested/read.C +++ b/types/unordered_set/nested/read.C @@ -21,8 +21,6 @@ static void PrintNestedUnorderedSetValue(const REntry &entry, std::ostream &os, bool last = false) { UnorderedSet &value = *entry.GetPtr(name); - std::vector valueInnerSorted( - value.begin(), value.end()); std::vector> valueSorted; for (auto inner : value) {