Skip to content

Commit

Permalink
- SimCode.mo
Browse files Browse the repository at this point in the history
  do not use listReverse on libs as List.union does not reverse the list anymore.
  this is needed to fix the wrong library order for linking.
- update to version 1.8.0



git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@9917 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Sep 24, 2011
1 parent a749d6b commit c6a8a62
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Compiler/BackEnd/SimCode.mo
Expand Up @@ -1699,7 +1699,7 @@ algorithm
list<RecordDeclaration> decls;
String name;
case ({}, accfns, rt, decls, includes, includeDirs, libs)
then (listReverse(accfns), rt, decls, listReverse(includes), includeDirs, listReverse(libs));
then (listReverse(accfns), rt, decls, includes, includeDirs, libs);
case ((DAE.FUNCTION(type_ = (DAE.T_FUNCTION(functionAttributes=DAE.FUNCTION_ATTRIBUTES(isBuiltin=DAE.FUNCTION_BUILTIN_PTR())),_)) :: rest), accfns, rt, decls, includes, includeDirs, libs)
equation
// skip over builtin functions
Expand Down Expand Up @@ -1808,7 +1808,7 @@ algorithm
inVars = List.map(DAEUtil.getInputVars(daeElts), daeInOutSimVar);
biVars = List.map(DAEUtil.getBidirVars(daeElts), daeInOutSimVar);
(recordDecls,rt_1) = elaborateRecordDeclarations(daeElts, recordDecls, rt);
(fn_includes, fn_includeDirs, fn_libs,dynamicLoad) = generateExtFunctionIncludes(fpath,ann);
(fn_includes, fn_includeDirs, fn_libs, dynamicLoad) = generateExtFunctionIncludes(fpath,ann);
includes = List.union(fn_includes, includes);
includeDirs = List.union(fn_includeDirs, includeDirs);
libs = List.union(fn_libs, libs);
Expand All @@ -1821,7 +1821,7 @@ algorithm
then
(EXTERNAL_FUNCTION(fpath, extfnname, funArgs, simextargs, extReturn,
inVars, outVars, biVars, fn_libs, lang, info, dynamicLoad),
rt_1,recordDecls,includes,includeDirs,libs);
rt_1, recordDecls, includes, includeDirs, libs);

// Record constructor.
case (DAE.RECORD_CONSTRUCTOR(path = fpath, source = source, type_ = tp as (DAE.T_FUNCTION(funcArg = args,funcResultType = restype as (DAE.T_COMPLEX(complexClassType = ClassInf.RECORD(name)),_)),_)), rt,recordDecls,includes,includeDirs,libs)
Expand Down
4 changes: 2 additions & 2 deletions Compiler/runtime/config.h
Expand Up @@ -90,9 +90,9 @@
#endif

#ifdef CONFIG_REVISION
#define CONFIG_VERSION "1.7.0 (r" CONFIG_REVISION ")"
#define CONFIG_VERSION "1.8.0 (r" CONFIG_REVISION ")"
#else
#define CONFIG_VERSION "1.7.0"
#define CONFIG_VERSION "1.8.0"
#endif


Expand Down

0 comments on commit c6a8a62

Please sign in to comment.