Simplify class design for Attributable and Series

openPMD · Sep 30, 2021 · 950bc0c · 950bc0c
1 parent c43cfa8
commit 950bc0c
Show file tree

Hide file tree

Showing 17 changed files with 320 additions and 483 deletions.
diff --git a/include/openPMD/IO/IOTask.hpp b/include/openPMD/IO/IOTask.hpp
@@ -37,11 +37,11 @@
 
 namespace openPMD
 {
-class AttributableInterface;
+class Attributable;
 class Writable;
 
 Writable*
-getWritable(AttributableInterface*);
+getWritable(Attributable*);
 
 /** Type of IO operation between logical and persistent data.
  */
@@ -604,7 +604,7 @@ class OPENPMDAPI_EXPORT IOTask
     { }
 
     template< Operation op >
-    explicit IOTask(AttributableInterface* a,
+    explicit IOTask(Attributable* a,
            Parameter< op > const & p)
             : writable{getWritable(a)},
               operation{op},

diff --git a/include/openPMD/Iteration.hpp b/include/openPMD/Iteration.hpp
@@ -44,7 +44,7 @@ class Iteration : public LegacyAttributable
             typename T_container
     >
     friend class Container;
-    friend class SeriesInterface;
+    friend class Series;
     friend class WriteIterations;
     friend class SeriesIterator;
 

diff --git a/include/openPMD/RecordComponent.hpp b/include/openPMD/RecordComponent.hpp
@@ -84,8 +84,7 @@ namespace internal
 {
     class RecordComponentData : public BaseRecordComponentData
     {
-        friend class openPMD::RecordComponent;
-
+    public:
         RecordComponentData();
 
         RecordComponentData( RecordComponentData const & ) = delete;
@@ -94,8 +93,6 @@ namespace internal
         RecordComponentData & operator=( RecordComponentData const & ) = delete;
         RecordComponentData & operator=( RecordComponentData && ) = delete;
 
-    OPENPMD_private:
-
         std::queue< IOTask > m_chunks;
         Attribute m_constantValue{ -1 };
         /**