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

Fix windows.h include #832

Merged
merged 4 commits into from
Jan 21, 2023
Merged

Fix windows.h include #832

merged 4 commits into from
Jan 21, 2023

Conversation

phlptp
Copy link
Collaborator

@phlptp phlptp commented Jan 13, 2023

This resolves #831 at least in my application.

The issue was the slimmed down include of windows.h worked well in most applications but if the code using CLI11 also included windows.h the slimmed down definitions conflicted and all sorts of chaos ensued. This wasn't an issue with the precompiled or static library editions of CLI but becomes a bigger issue with the single header include.

What this does is only include the actual required windows headers and not the outer wrapper for windows.h

…ws applications. Or at least minimizes the potential conflicts
@phlptp phlptp requested a review from henryiii January 13, 2023 16:53
@codecov
Copy link

codecov bot commented Jan 13, 2023

Codecov Report

Base: 99.45% // Head: 99.45% // No change to project coverage 👍

Coverage data is based on head (1bf23d3) compared to base (a227cd1).
Patch has no changes to coverable lines.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #832   +/-   ##
=======================================
  Coverage   99.45%   99.45%           
=======================================
  Files          18       18           
  Lines        4069     4069           
=======================================
  Hits         4047     4047           
  Misses         22       22           
Impacted Files Coverage Δ
include/CLI/impl/Argv_inl.hpp 100.00% <ø> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@henryiii henryiii merged commit 3cd730b into CLIUtils:main Jan 21, 2023
@github-actions github-actions bot added needs changelog Hasn't been added to the changelog yet needs README Needs to be mentioned in the README labels Jan 21, 2023
@phlptp phlptp deleted the fix_windows_includes branch March 11, 2023 01:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs changelog Hasn't been added to the changelog yet needs README Needs to be mentioned in the README
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Conflicts with the slimmed down window include
2 participants