Fix exceptions thrown by FGFunction and caught by FGAerodynamics#1152
Merged
bcoconni merged 2 commits intoJSBSim-Team:masterfrom Sep 11, 2024
Merged
Fix exceptions thrown by FGFunction and caught by FGAerodynamics#1152bcoconni merged 2 commits intoJSBSim-Team:masterfrom
bcoconni merged 2 commits intoJSBSim-Team:masterfrom
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1152 +/- ##
=======================================
Coverage 25.12% 25.13%
=======================================
Files 170 170
Lines 18337 18330 -7
=======================================
Hits 4608 4608
+ Misses 13729 13722 -7 ☔ View full report in Codecov by Sentry. |
Member
|
Looks good. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The class
FGAerodynamicscurrently catchesstd::stringexceptions thrown by the constructor ofFGFunction. HoweverFGFunctionis now throwing a mix of exceptions deriving from bothstd::stringandJSBSim::BaseException, soFGAerodynamicsis no longer catching all exceptions thrown by the constructor ofFGFunction.This PR is changing:
std::stringexceptions inFGFunctiontoJSBSim::BaseExceptionFGAerodynamicsfromstd::stringtoJSBSim::BaseException.Also the
try/catchblock inFGAerodynamicsis simplified in the process. Currently the code looks like:This PR avoids the duplication of the
try/catchblock by moving theif/elsecondition into thetryblock: