make Cpp code using BOOST_FOREACH work with DynArrayDim1

The iterator things are taken over from StatArrayDim1. The second declaration of <%iterName%> with fixed type short is considered a bug. git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25448 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 8, 2015 · d6d55cb · d6d55cb
1 parent 80ecad3
commit d6d55cb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -14348,7 +14348,7 @@ template algStmtForGeneric_impl(Exp exp, Ident iterator, String type,
   <<
   <%preExp%>
     <%type%> <%iterName%>;
-   BOOST_FOREACH( short <%iterName%>,  <%evar%> ){
+    BOOST_FOREACH(<%iterName%>, <%evar%>) {
       <%body%>
     }
   >>

diff --git a/SimulationRuntime/cpp/Include/Core/Math/Array.h b/SimulationRuntime/cpp/Include/Core/Math/Array.h
@@ -1341,12 +1341,26 @@ template<typename T>class DynArrayDim1 : public BaseArray<T>
   {
     return _multi_array.num_elements();
   }
- virtual size_t getNumDims() const
+  virtual size_t getNumDims() const
   {
      return 1;
   }
-  private:
-    boost::multi_array<T, 1> _multi_array;
+
+  typedef typename boost::multi_array<T, 1>::const_iterator const_iterator;
+  typedef typename boost::multi_array<T, 1>::iterator iterator;
+
+  iterator begin()
+  {
+    return _multi_array.begin();
+  }
+
+  iterator end()
+  {
+    return _multi_array.end();
+  }
+
+ private:
+  boost::multi_array<T, 1> _multi_array;
 };