[Cpp] Implement operator= for ArraySlice to avoid call to crefIsScalar

Belonging to [master]: - #2768 - OpenModelica/OpenModelica-testsuite#1070
OpenModelica · Nov 7, 2018 · 9188bd5 · 9188bd5
1 parent 648de42
commit 9188bd5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -11567,7 +11567,7 @@ template equationForLoop(SimEqSystem eq, Context context, Text &varDecls, SimCod
       <<
       for (int <%iterExp%> = <%startExp%>; <%iterExp%> <= <%endExp%>; <%iterExp%>++) {
         <%preExp%>
-        <%if crefSubIsScalar(cref) then '<%crefPart%> = <%expPart%>' else '<%crefPart%>.assign(<%expPart%>)'%>;
+        <%crefPart%> = <%expPart%>;
       }
       >>
 end equationForLoop;

diff --git a/SimulationRuntime/cpp/Include/Core/Math/ArraySlice.h b/SimulationRuntime/cpp/Include/Core/Math/ArraySlice.h
@@ -305,6 +305,18 @@ class ArraySlice: public ArraySliceConst<T> {
     , _baseIdx(ArraySliceConst<T>::_baseIdx) {
   }
 
+  ArraySlice<T>& operator=(const ArraySlice<T>& b)
+  {
+    this->assign(b);
+    return *this;
+  }
+
+  ArraySlice<T>& operator=(const BaseArray<T>& b)
+  {
+    this->assign(b);
+    return *this;
+  }
+
   virtual T& operator()(const vector<size_t> &idx) {
     return _baseArray(ArraySliceConst<T>::baseIdx(idx.size(), &idx[0]));
   }