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

PR followup for os.h false linter errors #2370

Merged
merged 1 commit into from
Jun 27, 2021
Merged

PR followup for os.h false linter errors #2370

merged 1 commit into from
Jun 27, 2021

Conversation

AidanSun05
Copy link
Contributor

This PR implements the changes proposed in issue #2368.

Copy link
Contributor

@DanielaE DanielaE left a comment

Choose a reason for hiding this comment

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

I suggest to squash all three commits into one to keep history clean.

@AidanSun05
Copy link
Contributor Author

Thanks for the suggestion @DanielaE - I have squashed the commits together.

@@ -64,7 +64,8 @@
# define FMT_HAS_FEATURE(x) 0
#endif

#if defined(__has_include) && !defined(__INTELLISENSE__) && \
#if defined(__has_include) && \
(!defined(__INTELLISENSE__) || (!FMT_MSC_VER || FMT_MSC_VER > 1900)) && \
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think we need the !FMT_MSC_VER check here because it will be covered by !defined(__INTELLISENSE__).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You are right, !FMT_MSC_VER is a redundant check. I have removed it.

Adjust definition for FMT_HAS_INCLUDE

Remove check for `!FMT_MSC_VER`
@vitaut vitaut merged commit f85fb9f into fmtlib:master Jun 27, 2021
@vitaut
Copy link
Contributor

vitaut commented Jun 27, 2021

Thanks

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.

3 participants