Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix compilation of ModelicaStandardTables.c if both TABLE_SHARE and NO_FILE_SYSTEM are defined #2915

Merged
merged 1 commit into from
May 6, 2019
Merged

Fix compilation of ModelicaStandardTables.c if both TABLE_SHARE and NO_FILE_SYSTEM are defined #2915

merged 1 commit into from
May 6, 2019

Conversation

beutlich
Copy link
Member

@beutlich beutlich commented May 5, 2019

TABLE_SHARE only is relevant if NO_FILE_SYSTEM is not defined.

@beutlich
Fix compilation if both TABLE_SHARE and NO_FILE_SYSTEM are defined
bb3b650 
TABLE_SHARE only is relevant if NO_FILE_SYSTEM is not defined.
@beutlich beutlich added bug Critical/severe issue L: C-Sources Issue addresses Modelica/Resources/C-Sources labels May 5, 2019
@beutlich beutlich added this to the MSL4.0.0 milestone May 5, 2019
@beutlich beutlich self-assigned this May 5, 2019
HansOlsson
HansOlsson approved these changes May 6, 2019
View reviewed changes
Copy link
Contributor

@HansOlsson HansOlsson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

The alternatives would be to remove the read-routine completely if NO_FILESYSTEM, but that seemed to cause more changes, or some #undef/#define logic - which I don't like.

sjoelund
sjoelund approved these changes May 6, 2019
View reviewed changes
Copy link
Member

@sjoelund sjoelund left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems OK, though I guess we could use some CI job to build the C libraries with different CPPFLAGS set to see it compiles fine and link to some dummy executable or unit test for the routines...

@beutlich
Copy link
Member Author

beutlich commented May 6, 2019

Seems OK, though I guess we could use some CI job to build the C libraries with different CPPFLAGS set to see it compiles fine and link to some dummy executable or unit test for the routines...

Here it is: https://travis-ci.org/tbeu/ModelicaStandardTables/jobs/528925986

@beutlich beutlich merged commit 1827aa2 into modelica:master May 6, 2019
@beutlich beutlich deleted the fix-compilation branch May 6, 2019 17:49
beutlich added a commit to beutlich/ModelicaStandardLibrary that referenced this pull request May 6, 2019
@beutlich
Fix compilation if both TABLE_SHARE and NO_FILE_SYSTEM are defined (m…
2f45165 
…odelica#2915)

TABLE_SHARE only is relevant if NO_FILE_SYSTEM is not defined.
@beutlich beutlich mentioned this pull request May 6, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sjoelund sjoelund sjoelund approved these changes

@HansOlsson HansOlsson HansOlsson approved these changes

Assignees

@beutlich beutlich

Labels
bug Critical/severe issue L: C-Sources Issue addresses Modelica/Resources/C-Sources
Projects
None yet
Milestone
MSL4.0.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@beutlich @sjoelund @HansOlsson