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: add guard for GCC <10.3 on C++20 #5205

Merged

Conversation

InvincibleRMC
Copy link
Contributor

@InvincibleRMC InvincibleRMC commented Jun 27, 2024

Description

Fixes #5201 and updates CI.

Suggested changelog entry:

   Fix regression introduced in #5201 for GCC<10.3 in C++20 mode.

@InvincibleRMC InvincibleRMC marked this pull request as ready for review June 27, 2024 23:28
@InvincibleRMC
Copy link
Contributor Author

InvincibleRMC commented Jun 27, 2024

Let me know if it is desired to store the guard somewhere else and have it referenced or just having 4 instances of the guard is fine.

@InvincibleRMC
Copy link
Contributor Author

Also please let me know if you want to test on gcc 10.1 or 10.2 if that is even possible.

@rwgk
Copy link
Collaborator

rwgk commented Jun 27, 2024 via email

@henryiii henryiii changed the title Add Guard for GCC 9/10.1/10.2 on C++20 fix: add Guard for GCC 9/10.1/10.2 on C++20 Jun 28, 2024
@henryiii henryiii changed the title fix: add Guard for GCC 9/10.1/10.2 on C++20 fix: add Guard for GCC <10.3 on C++20 Jun 28, 2024
@henryiii henryiii changed the title fix: add Guard for GCC <10.3 on C++20 fix: add guard for GCC <10.3 on C++20 Jun 28, 2024
@rwgk
Copy link
Collaborator

rwgk commented Jun 28, 2024

Let me know if it is desired to store the guard somewhere else and have it referenced or just having 4 instances of the guard is fine.

Yeah, that was a bit much of duplicated code, but it's very easily avoided. I went ahead and did that. Thanks for creating this PR, from there it was very quick.

@rwgk rwgk merged commit 08f946a into pybind:master Jun 28, 2024
86 checks passed
@github-actions github-actions bot added the needs changelog Possibly needs a changelog entry label Jun 28, 2024
@InvincibleRMC InvincibleRMC deleted the fix-gcc__cpp_nontype_template_parameter_class branch June 28, 2024 13:06
EchterAgo added a commit to EchterAgo/Electron-Cash that referenced this pull request Jul 6, 2024
henryiii pushed a commit that referenced this pull request Aug 12, 2024
* Update CI

* update define guard

* style: pre-commit fixes

* updated define guard

* style: pre-commit fixes

* update guard

* testing new guards

* update guards

* surely this time

* style: pre-commit fixes

* Define PYBIND11_TYPING_H_HAS_STRING_LITERAL to avoid repeating a complex expression.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ralf W. Grosse-Kunstleve <[email protected]>
@henryiii henryiii removed the needs changelog Possibly needs a changelog entry label Aug 13, 2024
henryiii pushed a commit that referenced this pull request Aug 13, 2024
* Update CI

* update define guard

* style: pre-commit fixes

* updated define guard

* style: pre-commit fixes

* update guard

* testing new guards

* update guards

* surely this time

* style: pre-commit fixes

* Define PYBIND11_TYPING_H_HAS_STRING_LITERAL to avoid repeating a complex expression.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ralf W. Grosse-Kunstleve <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG]: Compilation failure with GCC 10.2 on pybind11 2.13.0 (typing.h, line 209)
3 participants