Skip to content

Commit

Permalink
Merge pull request #3151 from GEOS-ESM/bugfix/wdboggs/undo_function_o…
Browse files Browse the repository at this point in the history
…verload_macro

Change '_FUNCN' to '_FUNC' which is the correct macro appearing in files in field subdirectory
  • Loading branch information
tclune authored Nov 4, 2024
2 parents 57462ce + 01d41fc commit 8305c33
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Implemented workaround for NAG related to ArrayReference use in GriddedIO.
- Implemented workarounds to avoid needing `-dusty` for NAG. (Related PR in ESMA_CMake.)
- Added constructor for DSO_SetServicesWrapper
- Change macro in field/undo_function_overload.macro

## [Unreleased]

Expand Down
2 changes: 1 addition & 1 deletion field/undo_function_overload.macro
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#undef _FUNCN
#undef _FUNC
#undef _IDENTITY
#undef _SUB
#undef __SUB
Expand Down

0 comments on commit 8305c33

Please sign in to comment.