unordered_*set: Include std::hash also for reading

hahnjo · hahnjo · commit 95ae6b2e0bd4 · 2026-05-19T14:15:19.000+02:00
Otherwise there may be errors with newer compilers and libstdc++.
diff --git a/types/unordered_multiset/nested/NestedUnorderedMultiset.hxx b/types/unordered_multiset/nested/NestedUnorderedMultiset.hxx
@@ -14,3 +14,6 @@ struct std::hash<std::unordered_multiset<std::int32_t>> {
     return h;
   }
 };
+
+using UnorderedMultiset =
+    std::unordered_multiset<std::unordered_multiset<std::int32_t>>;
diff --git a/types/unordered_multiset/nested/read.C b/types/unordered_multiset/nested/read.C
@@ -11,8 +11,7 @@
 #include <string_view>
 #include <unordered_set>
 
-using UnorderedMultiset =
-    std::unordered_multiset<std::unordered_multiset<std::int32_t>>;
+#include "NestedUnorderedMultiset.hxx"
 
 static void PrintNestedUnorderedMultisetValue(const ROOT::REntry &entry,
                                               std::string_view name,
diff --git a/types/unordered_multiset/nested/write.C b/types/unordered_multiset/nested/write.C
@@ -18,9 +18,6 @@
 
 #include "NestedUnorderedMultiset.hxx"
 
-using UnorderedMultiset =
-    std::unordered_multiset<std::unordered_multiset<std::int32_t>>;
-
 static std::shared_ptr<UnorderedMultiset>
 MakeUnorderedMultisetField(ROOT::RNTupleModel &model, std::string_view name,
                            ROOT::ENTupleColumnType indexType) {
diff --git a/types/unordered_set/nested/NestedUnorderedSet.hxx b/types/unordered_set/nested/NestedUnorderedSet.hxx
@@ -13,3 +13,5 @@ template <> struct std::hash<std::unordered_set<std::int32_t>> {
     return h;
   }
 };
+
+using UnorderedSet = std::unordered_set<std::unordered_set<std::int32_t>>;
diff --git a/types/unordered_set/nested/read.C b/types/unordered_set/nested/read.C
@@ -11,7 +11,7 @@
 #include <string_view>
 #include <unordered_set>
 
-using UnorderedSet = std::unordered_set<std::unordered_set<std::int32_t>>;
+#include "NestedUnorderedSet.hxx"
 
 static void PrintNestedUnorderedSetValue(const ROOT::REntry &entry,
                                          std::string_view name,
diff --git a/types/unordered_set/nested/write.C b/types/unordered_set/nested/write.C
@@ -18,8 +18,6 @@
 
 #include "NestedUnorderedSet.hxx"
 
-using UnorderedSet = std::unordered_set<std::unordered_set<std::int32_t>>;
-
 static std::shared_ptr<UnorderedSet>
 MakeUnorderedSetField(ROOT::RNTupleModel &model, std::string_view name,
                       ROOT::ENTupleColumnType indexType) {

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,6 @@ struct std::hash<std::unordered_multiset<std::int32_t>> {`
`14`	`14`	`return h;`
`15`	`15`	`}`
`16`	`16`	`};`
	`17`	`+`
	`18`	`+using UnorderedMultiset =`
	`19`	`+ std::unordered_multiset<std::unordered_multiset<std::int32_t>>;`
Original file line number	Diff line number	Diff line change
`@@ -13,3 +13,5 @@ template <> struct std::hash<std::unordered_set<std::int32_t>> {`
`13`	`13`	`return h;`
`14`	`14`	`}`
`15`	`15`	`};`
	`16`	`+`
	`17`	`+using UnorderedSet = std::unordered_set<std::unordered_set<std::int32_t>>;`