- more fixes for bug #1956 for +scodeInstShortcut (should fix some of…

… the AVM models) git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@14487 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Dec 20, 2012 · 8a97e77 · 8a97e77
1 parent c780843
commit 8a97e77
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Compiler/FrontEnd/NFSCodeAnalyseRedeclare.mo b/Compiler/FrontEnd/NFSCodeAnalyseRedeclare.mo
@@ -631,7 +631,8 @@ algorithm
 
         comp = inElement;
         comp = SCode.setComponentTypeSpec(comp, Absyn.TPATH(tpath, ad));
-        infos = mkInfos(List.union(previousItem,inPreviousItem), {RP(replacements),EI(comp, env),EI(orig, inEnv)});
+        comp = mergeComponentModifiers(comp, orig);
+        infos = mkInfos(List.union(previousItem,inPreviousItem), {RP(replacements), EI(comp, env)});
 
         fullName = NFSCodeEnv.mergePathWithEnvPath(Absyn.IDENT(name), inEnv); 
 

diff --git a/Compiler/FrontEnd/SCodeUtil.mo b/Compiler/FrontEnd/SCodeUtil.mo
@@ -2021,7 +2021,6 @@ algorithm
     //       instantiation doesn't handle class modifications yet. Enable this
     //       when it does.
     /*************************************************************************/
-
     case SCode.CLASS(name, prefs, ep, pp, res, SCode.DERIVED(ty, mod, attr, cmt), info)
       equation
         true = Flags.isSet(Flags.SCODE_INST_SHORTCUT);