Skip to content

Commit

Permalink
Merged revision(s) 7897 from Modelica/trunk:
Browse files Browse the repository at this point in the history
Moved erroneously placed annotations in usertab tests. (#1607)
........


git-svn-id: https://svn.modelica.org/projects/Modelica/branches/maintenance/3.2.1@8017 7ce873d0-865f-4ce7-a662-4bb36ea78beb
  • Loading branch information
beutlich committed Jan 5, 2015
1 parent 9e570ed commit ffaad08
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ModelicaTest/Tables/CombiTable1D.mo
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ package CombiTable1D
extends Modelica.Icons.Function;
input Real dummy_u[:];
output Real dummy_y;
external "C" dummy_y = mydummyfunc(dummy_u);
external "C" dummy_y = mydummyfunc(dummy_u)
annotation(IncludeDirectory="modelica://Modelica/Resources/Data/Tables",
Include = "#include \"usertab.c\"
double mydummyfunc(const double* dummy_in) {
Expand Down
2 changes: 1 addition & 1 deletion ModelicaTest/Tables/CombiTable1Ds.mo
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ package CombiTable1Ds
extends Modelica.Icons.Function;
input Real dummy_u[:];
output Real dummy_y;
external "C" dummy_y = mydummyfunc(dummy_u);
external "C" dummy_y = mydummyfunc(dummy_u)
annotation(IncludeDirectory="modelica://Modelica/Resources/Data/Tables",
Include = "#include \"usertab.c\"
double mydummyfunc(const double* dummy_in) {
Expand Down
2 changes: 1 addition & 1 deletion ModelicaTest/Tables/CombiTable2D.mo
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ package CombiTable2D
extends Modelica.Icons.Function;
input Real dummy_u;
output Real dummy_y;
external "C" dummy_y = mydummyfunc(dummy_u);
external "C" dummy_y = mydummyfunc(dummy_u)
annotation(IncludeDirectory="modelica://Modelica/Resources/Data/Tables",
Include = "#include \"usertab.c\"
double mydummyfunc(double dummy_in) {
Expand Down
2 changes: 1 addition & 1 deletion ModelicaTest/Tables/CombiTimeTable.mo
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ package CombiTimeTable
extends Modelica.Icons.Function;
input Real dummy_u[:];
output Real dummy_y;
external "C" dummy_y = mydummyfunc(dummy_u);
external "C" dummy_y = mydummyfunc(dummy_u)
annotation(IncludeDirectory="modelica://Modelica/Resources/Data/Tables",
Include = "#include \"usertab.c\"
double mydummyfunc(const double* dummy_in) {
Expand Down

0 comments on commit ffaad08

Please sign in to comment.