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.

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

[FMI] Catch asserts in fmi2GetXXX #6757

Merged
merged 1 commit into from Sep 22, 2020

Conversation

AnHeuermann
Copy link
Member

Catch asserst in fmi2Get{Real,Integer,Boolean,String} and return fmi2Error

Also added #if NUMBER_OF_INTEGERS > 0 to do nothing if there are no integers. Same for booleans and strings.

Related issue:
https://trac.openmodelica.org/OpenModelica/ticket/6125

@AnHeuermann AnHeuermann added the COMP/FMI Issue and pull request related to FMI export label Sep 21, 2020
@AnHeuermann AnHeuermann self-assigned this Sep 21, 2020
  - Catch asserst in fmi2Get{Real,Integer,Boolean,String}
    and return fmi2Error
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.

Looks reasonable

@sjoelund
Copy link
Member

Maybe there could be a macro to not duplicate so much similar code, but it should be ok

@adrpo adrpo merged commit 58640b2 into OpenModelica:master Sep 22, 2020
@AnHeuermann AnHeuermann deleted the issue6125-dontTrowErrInFMU branch September 22, 2020 12:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
COMP/FMI Issue and pull request related to FMI export
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants