[workaround] Disable sorting of external objects for cpp runtime

- see ticket:3446
OpenModelica · Jan 10, 2017 · 1bf65f3 · 1bf65f3
1 parent cde3ffc
commit 1bf65f3
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Compiler/BackEnd/Initialization.mo b/Compiler/BackEnd/Initialization.mo
@@ -806,7 +806,14 @@ algorithm
   allParameterEqns := BackendEquation.emptyEqns();
   otherVariables := BackendVariable.emptyVars();
   (allParameters, allParameterEqns, otherVariables) := BackendVariable.traverseBackendDAEVars(dae.shared.globalKnownVars, selectParameter2, (allParameters, allParameterEqns, otherVariables));
-  (allParameters, allParameterEqns, otherVariables) := BackendVariable.traverseBackendDAEVars(dae.shared.externalObjects, selectParameter2, (allParameters, allParameterEqns, otherVariables));
+
+  // FIXME: This if clause is a workaround. Remove it as soon as cpp runtime is
+  // adapted to handle external objects together with parameters.
+  // see ticket:3446
+  if not stringEq(Config.simCodeTarget(), "Cpp") then
+    (allParameters, allParameterEqns, otherVariables) := BackendVariable.traverseBackendDAEVars(dae.shared.externalObjects, selectParameter2, (allParameters, allParameterEqns, otherVariables));
+  end if;
+
   nParam := BackendVariable.varsSize(allParameters);
 
   if nParam > 0 then