Skip to content

Normalize header guard macros#370

Merged
greenc-FNAL merged 1 commit intomainfrom
maintenance/normalize-header-guards
Feb 27, 2026
Merged

Normalize header guard macros#370
greenc-FNAL merged 1 commit intomainfrom
maintenance/normalize-header-guards

Conversation

@greenc-FNAL
Copy link
Contributor

@greenc-FNAL greenc-FNAL commented Feb 26, 2026

  • Avoid using reserved macro names (leading __).
  • Macro form is X_Y_..._HEADER_EXT, where X is the first subdirectory from the top level of the Phlex repository, and HEADER_EXT is the full capitalized base name of the
    header file.

@greenc-FNAL greenc-FNAL marked this pull request as ready for review February 27, 2026 00:30
Copy link
Member

@knoepfel knoepfel left a comment

Choose a reason for hiding this comment

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

Do we want to mandate a comment following the closing #endif? Some files have

#endif // SOME_FILE_NAME_EXT

and some just have #endif with no trailing comment.

@codecov
Copy link

codecov bot commented Feb 27, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.

@@            Coverage Diff             @@
##             main     #370      +/-   ##
==========================================
- Coverage   85.32%   85.20%   -0.13%     
==========================================
  Files         122      122              
  Lines        2433     2433              
  Branches      389      389              
==========================================
- Hits         2076     2073       -3     
- Misses        232      233       +1     
- Partials      125      127       +2     
Flag Coverage Δ
unittests 85.20% <ø> (-0.13%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
form/form/config.hpp 100.00% <ø> (ø)
form/form/form.hpp 100.00% <ø> (ø)
form/form/technology.hpp 66.66% <ø> (ø)
form/persistence/ipersistence.hpp 100.00% <ø> (ø)
form/persistence/persistence.hpp 100.00% <ø> (ø)
form/root_storage/root_tbranch_container.hpp 100.00% <ø> (ø)
form/storage/istorage.hpp 100.00% <ø> (ø)
form/storage/storage.hpp 100.00% <ø> (ø)
form/storage/storage_association.hpp 100.00% <ø> (ø)
form/storage/storage_container.hpp 100.00% <ø> (ø)
... and 4 more

... and 2 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1519632...97b4073. Read the comment docs.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@greenc-FNAL
Copy link
Contributor Author

Do we want to mandate a comment following the closing #endif? Some files have

#endif // SOME_FILE_NAME_EXT

and some just have #endif with no trailing comment.

The script was supposed to annotate the #endif, but appears not to be 100% effective. I will audit the headers properly in the morning.

aolivier23
aolivier23 previously approved these changes Feb 27, 2026
Copy link
Contributor

@aolivier23 aolivier23 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 to me. I payed special attention to the FORM include guards.

gemmeren
gemmeren previously approved these changes Feb 27, 2026
Copy link
Contributor

@gemmeren gemmeren left a comment

Choose a reason for hiding this comment

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

Thanks Chris

@greenc-FNAL greenc-FNAL dismissed stale reviews from gemmeren and aolivier23 via e414151 February 27, 2026 15:28
@greenc-FNAL greenc-FNAL force-pushed the maintenance/normalize-header-guards branch from a722bf2 to e414151 Compare February 27, 2026 15:28
@greenc-FNAL greenc-FNAL merged commit abdbc0c into main Feb 27, 2026
47 of 48 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants