Use an owning copy of Series in ReadIterations

franzpoeschel · Feb 19, 2021 · 6f21962 · 6f21962
1 parent 9e0df7f
commit 6f21962
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/include/openPMD/Series.hpp b/include/openPMD/Series.hpp
@@ -492,7 +492,7 @@ class SeriesIterator
 {
     using iteration_index_t = IndexedIteration::index_t;
 
-    using maybe_series_t = auxiliary::Option< Series * >;
+    using maybe_series_t = auxiliary::Option< Series >;
 
     maybe_series_t m_series;
     iteration_index_t m_currentIteration = 0;
@@ -501,10 +501,9 @@ class SeriesIterator
     SeriesIterator();
 
 public:
-    SeriesIterator( Series * );
+    SeriesIterator( Series );
 
-    SeriesIterator &
-    operator++();
+    SeriesIterator & operator++();
 
     IndexedIteration
     operator*();
@@ -543,13 +542,12 @@ class ReadIterations
     using iterations_t = decltype( internal::SeriesData::iterations );
     using iterator_t = SeriesIterator;
 
-    Series * m_series;
+    Series m_series;
 
-    ReadIterations( Series * );
+    ReadIterations( Series );
 
 public:
-    iterator_t
-    begin();
+    iterator_t begin();
 
     iterator_t
     end();

diff --git a/src/Series.cpp b/src/Series.cpp
@@ -1222,7 +1222,7 @@ Series::Series(
 
 ReadIterations Series::readIterations()
 {
-    return { this };
+    return { *this };
 }
 
 WriteIterations
@@ -1315,10 +1315,11 @@ SeriesIterator::SeriesIterator() : m_series()
 {
 }
 
-SeriesIterator::SeriesIterator( Series * series ) : m_series( series )
+SeriesIterator::SeriesIterator( Series series )
+    : m_series( std::move( series ) )
 {
-    auto it = series->iterations.begin();
-    if( it == series->iterations.end() )
+    auto it = series.get().iterations.begin();
+    if( it == series.get().iterations.end() )
     {
         *this = end();
         return;
@@ -1344,7 +1345,7 @@ SeriesIterator::operator++()
         *this = end();
         return *this;
     }
-    Series & series = *m_series.get();
+    Series & series = m_series.get();
     auto & iterations = series.iterations;
     auto & currentIteration = iterations[ m_currentIteration ];
     if( !currentIteration.closed() )
@@ -1409,7 +1410,7 @@ IndexedIteration
 SeriesIterator::operator*()
 {
     return IndexedIteration(
-        m_series.get()->iterations[ m_currentIteration ], m_currentIteration );
+        m_series.get().iterations[ m_currentIteration ], m_currentIteration );
 }
 
 bool
@@ -1431,7 +1432,8 @@ SeriesIterator::end()
     return {};
 }
 
-ReadIterations::ReadIterations( Series * series ) : m_series( series )
+ReadIterations::ReadIterations( Series series )
+    : m_series( std::move( series ) )
 {
 }