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

Restore and modernize ModelicaUtilities.h #4535

Merged
merged 3 commits into from
Feb 25, 2025
Merged

Restore and modernize ModelicaUtilities.h #4535

merged 3 commits into from
Feb 25, 2025

Conversation

beutlich
Copy link
Member

@beutlich beutlich commented Feb 15, 2025 •
edited
Loading

Same as #4487, but targeting master branch and additionally

  • adapting CMake configuration files
  • modernizing noreturn function attribute/specifier as proposed by @HansOlsson

@beutlich
refs modelica#4484: Restore ModelicaUtilities.h
dfa866c 
Revert "refs modelica#3867: Remove LICENSE_ModelicaUtilities.txt"

This reverts commit 7fe506f.

Revert "refs modelica#3867: Remove ModelicaUtilities.h"

This reverts commit 1bb1d40.
@beutlich
Configure MODELICA_UTILITIES_INCLUDE_DIR for CMake
821b07c
@beutlich
Modernize and simplify noreturn function attribute/specifier
badfdbd 
* Handle C23
* Remove fallback to legacy clang extension
* Remove fallback to legacy gcc2/gcc3 extensions
@beutlich beutlich requested a review from casella February 15, 2025 09:42
@beutlich beutlich added L: C-Sources Issue addresses Modelica/Resources/C-Sources L: Resources Issue addresses Modelica/Resources (excl. C-Sources) labels Feb 15, 2025
@beutlich beutlich mentioned this pull request Feb 15, 2025
Open
casella
casella approved these changes Feb 25, 2025
View reviewed changes
Copy link
Contributor

@casella casella left a comment

Choose a reason for hiding this comment

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

LGTM, also after MAP-Lib discussion

@casella casella requested a review from maltelenz February 25, 2025 10:58
maltelenz
maltelenz approved these changes Feb 25, 2025
View reviewed changes
Copy link
Contributor

@maltelenz maltelenz left a comment

Choose a reason for hiding this comment

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

Approving as asked by MAPLib meeting.

@casella casella merged commit 2ed982f into modelica:master Feb 25, 2025
11 checks passed
@casella
Copy link
Contributor

casella commented Feb 25, 2025

@maltelenz please back-port this to maint/4.1.x as agreed during the MAP-Lib meeting

@maltelenz
Copy link
Contributor

@casella See comment here: #4484 (comment)

@henrikt-ma henrikt-ma mentioned this pull request Feb 27, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maltelenz maltelenz maltelenz approved these changes

@casella casella casella approved these changes

@HansOlsson HansOlsson Awaiting requested review from HansOlsson

@henrikt-ma henrikt-ma Awaiting requested review from henrikt-ma

Assignees
No one assigned
Labels
L: C-Sources Issue addresses Modelica/Resources/C-Sources L: Resources Issue addresses Modelica/Resources (excl. C-Sources)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@beutlich @casella @maltelenz