Skip to content

Commit

Permalink
move iterator from DynArray to DynArrayDim1, where it was before
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25694 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
rfranke committed Apr 22, 2015
1 parent 3ae39f7 commit 4e83a63
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions SimulationRuntime/cpp/Include/Core/Math/Array.h
Expand Up @@ -1511,19 +1511,6 @@ class DynArray : public BaseArray<T>
return ndims;
}

typedef typename boost::multi_array<T, ndims>::const_iterator const_iterator;
typedef typename boost::multi_array<T, ndims>::iterator iterator;

iterator begin()
{
return _multi_array.begin();
}

iterator end()
{
return _multi_array.end();
}

protected:
boost::multi_array<T, ndims> _multi_array;
};
Expand Down Expand Up @@ -1602,6 +1589,19 @@ class DynArrayDim1 : public DynArray<T, 1>
_multi_array.reindex(1);
}

typedef typename boost::multi_array<T, ndims>::const_iterator const_iterator;
typedef typename boost::multi_array<T, ndims>::iterator iterator;

iterator begin()
{
return _multi_array.begin();
}

iterator end()
{
return _multi_array.end();
}

private:
boost::multi_array<T, 1> &_multi_array; // refers to base class
};
Expand Down

0 comments on commit 4e83a63

Please sign in to comment.