HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r674:07d26320a984

Adapts iterator to be MoveAssignable...

Alexandre Leroux -

r674:07d26320a984

parent child

Context file:

r674:07d26320a984

core/include/Data/ArrayData.h +15 0

              template <int Dim>
              struct IteratorValueBuilder<Dim, true> {
                  using DataContainerIterator = DataContainer::const_iterator;
+                 static void swap(IteratorValue<Dim, true> &o1, IteratorValue<Dim, true> &o2) {}
              };
              template <int Dim>
              struct IteratorValueBuilder<Dim, false> {
                  using DataContainerIterator = DataContainer::iterator;
+                 static void swap(IteratorValue<Dim, false> &o1, IteratorValue<Dim, false> &o2)
+                 {
+                     for (auto i = 0; i < o1.m_NbComponents; ++i) {
+                         std::iter_swap(o1.m_It + i, o2.m_It + i);
+                     }
+                 }
              };
              template <int Dim, bool IsConst>
                      return result;
                  }
+                 void swap(ArrayDataIteratorValue::Impl &other) override
+                 {
+                     auto &otherImpl = dynamic_cast<IteratorValue &>(other);
+                     IteratorValueBuilder<Dim, IsConst>::swap(*this, otherImpl);
+                 }
              private:
                  DataContainerIterator m_It;
                  int m_NbComponents;

core/include/Data/ArrayDataIterator.h +9 -1

                      virtual double min() const = 0;
                      virtual double max() const = 0;
                      virtual QVector<double> values() const = 0;
+                     virtual void swap(Impl &other) = 0;
                  };
                  explicit ArrayDataIteratorValue(std::unique_ptr<Impl> impl);
                  ArrayDataIteratorValue(const ArrayDataIteratorValue &other);
-                 ArrayDataIteratorValue(ArrayDataIteratorValue &&other) = default;
                  ArrayDataIteratorValue &operator=(ArrayDataIteratorValue other);
                  bool equals(const ArrayDataIteratorValue &other) const;
                  /// Gets all values
                  QVector<double> values() const;
+                 Impl *impl();
+                 friend void swap(ArrayDataIteratorValue &lhs, ArrayDataIteratorValue &rhs)
+                 {
+                     std::swap(lhs.m_Impl, rhs.m_Impl);
+                 }
              private:
                  std::unique_ptr<Impl> m_Impl;
              };

core/include/Data/DataSeries.h +7 0

                  double maxValue() const override { return m_ValuesIt->max(); }
                  QVector<double> values() const override { return m_ValuesIt->values(); }
+                 void swap(DataSeriesIteratorValue::Impl &other) override
+                 {
+                     auto &otherImpl = dynamic_cast<IteratorValue &>(other);
+                     m_XIt->impl()->swap(*otherImpl.m_XIt->impl());
+                     m_ValuesIt->impl()->swap(*otherImpl.m_ValuesIt->impl());
+                 }
              private:
                  ArrayDataIterator m_XIt;
                  ArrayDataIterator m_ValuesIt;

core/include/Data/DataSeriesIterator.h +9 -1

                      virtual double minValue() const = 0;
                      virtual double maxValue() const = 0;
                      virtual QVector<double> values() const = 0;
+                     virtual void swap(Impl &other) = 0;
                  };
                  explicit DataSeriesIteratorValue(std::unique_ptr<Impl> impl);
                  DataSeriesIteratorValue(const DataSeriesIteratorValue &other);
-                 DataSeriesIteratorValue(DataSeriesIteratorValue &&other) = default;
                  DataSeriesIteratorValue &operator=(DataSeriesIteratorValue other);
                  bool equals(const DataSeriesIteratorValue &other) const;
                  /// Gets all values data
                  QVector<double> values() const;
+                 Impl *impl();
+                 friend void swap(DataSeriesIteratorValue &lhs, DataSeriesIteratorValue &rhs)
+                 {
+                     std::swap(lhs.m_Impl, rhs.m_Impl);
+                 }
              private:
                  std::unique_ptr<Impl> m_Impl;
              };

core/include/Data/SqpIterator.h +1 -3

                  virtual ~SqpIterator() noexcept = default;
                  SqpIterator(const SqpIterator &) = default;
-                 SqpIterator(SqpIterator &&) = default;
-                 SqpIterator &operator=(const SqpIterator &) = default;
-                 SqpIterator &operator=(SqpIterator &&) = default;
+                 SqpIterator &operator=(SqpIterator other) { swap(m_CurrentValue, other.m_CurrentValue); }
                  SqpIterator &operator++()
                  {

core/src/Data/ArrayDataIterator.cpp +6 -1

              ArrayDataIteratorValue &ArrayDataIteratorValue::operator=(ArrayDataIteratorValue other)
              {
-                 std::swap(m_Impl, other.m_Impl);
+                 m_Impl->swap(*other.m_Impl);
                  return *this;
              }
              {
                  return m_Impl->values();
              }
+             ArrayDataIteratorValue::Impl *ArrayDataIteratorValue::impl()
+             {
+                 return m_Impl.get();
+             }

core/src/Data/DataSeriesIterator.cpp +6 -1

              DataSeriesIteratorValue &DataSeriesIteratorValue::operator=(DataSeriesIteratorValue other)
              {
-                 std::swap(m_Impl, other.m_Impl);
+                 m_Impl->swap(*other.m_Impl);
                  return *this;
              }
              {
                  return m_Impl->values();
              }
+             DataSeriesIteratorValue::Impl *DataSeriesIteratorValue::impl()
+             {
+                 return m_Impl.get();
+             }

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages