CI fixes

Author: franzpoeschel

include/openPMD/Iteration.hpp

@@ -537,4 +537,10 @@ class IndexedIteration : public Iteration
         : Iteration(std::forward<Iteration_t>(it)), iterationIndex(index)
     {}
 };
+
+class Iterations : public Container<Iteration, Iteration::IterationIndex_t>
+{
+public:
+    void visitHierarchy(HierarchyVisitor &v, bool recursive) override;
+};
 } // namespace openPMD

include/openPMD/Series.hpp

@@ -66,12 +66,6 @@ class ReadIterations;
 class StatefulIterator;
 class Series;
 
-class Iterations : public Container<Iteration, Iteration::IterationIndex_t>
-{
-public:
-    void visitHierarchy(HierarchyVisitor &v, bool recursive) override;
-};
-
 namespace internal
 {
     /* Just a more self-documenting boolean used for

include/openPMD/backend/Attributable.hpp

@@ -414,6 +414,7 @@ class Attributable
      *       HierarchyVisitor to keep the interface clean.
      *
      * @param visitor Operations to run for each object.
+     * @param recursive Extend the operation recursively to children.
      */
     virtual void visitHierarchy(HierarchyVisitor &visitor, bool recursive);
 

include/openPMD/snapshots/ContainerImpls.hpp

@@ -131,9 +131,9 @@ class RandomAccessIteratorContainer : public AbstractSnapshotsContainer
 {
 private:
     friend class Series;
-    using Container_t = Container<Iteration, key_type>;
+    using Container_t = Iterations;
     Container_t m_cont;
-    RandomAccessIteratorContainer(Container<Iteration, key_type> cont);
+    RandomAccessIteratorContainer(Iterations cont);
 
     using concrete_iterator_type = RandomAccessIterator<Container_t::iterator>;
     using concrete_reverse_iterator_type =

src/Iteration.cpp

@@ -983,6 +983,11 @@ void Iteration::scientificDefaults_impl(bool write, OpenpmdStandard)
         .withReader(float_types, require_type<double>())(wor);
 }
 
+void Iterations::visitHierarchy(HierarchyVisitor &v, bool recursive)
+{
+    visitHierarchyImpl<Iterations>(v, recursive);
+}
+
 template float Iteration::time<float>() const;
 template double Iteration::time<double>() const;
 template long double Iteration::time<long double>() const;

src/Series.cpp

@@ -218,11 +218,6 @@ struct Series::ParsedInput
     bool verify_homogeneous_extents = true;
 }; // ParsedInput
 
-void Iterations::visitHierarchy(HierarchyVisitor &v, bool recursive)
-{
-    visitHierarchyImpl<Iterations>(v, recursive);
-}
-
 std::string Series::openPMD() const
 {
     return getAttribute("openPMD").get<std::string>();

test/CoreTest.cpp

@@ -1087,7 +1087,7 @@ TEST_CASE("wrapper_test", "[core]")
         Datatype::LONG_DOUBLE);
     REQUIRE(o.iterations[1].meshes["E"]["x"].getExtent() == Extent{7});
 
-    Container<Iteration, uint64_t> its = o.iterations;
+    Iterations its = o.iterations;
     its[1].meshes["E"]["y"].resetDataset(Dataset(Datatype::CHAR, {2}));
     REQUIRE(o.iterations[1].meshes["E"].count("y") == 1);
     REQUIRE(o.iterations[1].meshes["E"]["y"].getDatatype() == Datatype::CHAR);