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.

Sign up for GitHub

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

Experimental: Changes on top of PR #4953 #5411

Closed
wants to merge 8 commits into from
Closed

Experimental: Changes on top of PR #4953 #5411

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
607812a
Fix MSVC MT/MD incompatibility in PYBIND11_BUILD_ABI
isuruf Nov 28, 2023
71b0e9e
Update comment about which PR
isuruf Nov 28, 2023
d1695f1
Use msvc major version
isuruf Nov 30, 2023
4c6c344
Use _MSC_VER/100
isuruf Oct 1, 2024
0444494
Merge branch 'master' into incompat_experimental_rwgk
rwgk Oct 13, 2024
5b9078d
Minor cleanup of `PYBIND11_BUILD_ABI` logic/comments. Eliminate fall-…
rwgk Oct 13, 2024
b0f9089
Disable fall-through `""` for `PYBIND11_BUILD_ABI`
rwgk Oct 13, 2024
24914e9
Special case for `__NVCOMPILER`, no fallback for `PYBIND11_BUILD_ABI`…
rwgk Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions include/pybind11/detail/internals.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,15 +310,21 @@ struct type_info {
# endif
#endif

/// On Linux/OSX, changes in __GXX_ABI_VERSION__ indicate ABI incompatibility.
/// On MSVC, changes in _MSC_VER may indicate ABI incompatibility (#2898).
#ifndef PYBIND11_BUILD_ABI
# if defined(__GXX_ABI_VERSION)
# if defined(__GXX_ABI_VERSION) // Linux/OSX.
# define PYBIND11_BUILD_ABI "_cxxabi" PYBIND11_TOSTRING(__GXX_ABI_VERSION)
# elif defined(_MSC_VER)
# define PYBIND11_BUILD_ABI "_mscver" PYBIND11_TOSTRING(_MSC_VER)
# elif defined(_MSC_VER) // See PR #4953.
# if defined(_MT)
# define PYBIND11_BUILD_ABI "_mt_mscver" PYBIND11_TOSTRING(_MSC_VER)
# elif defined(_MD)
# define PYBIND11_BUILD_ABI "_md_mscver" PYBIND11_TOSTRING(((int) (_MSC_VER) / 100))
# else
# error "UNEXPECTED PREPROCESSOR MACROS (MSVC): PLEASE REVISE THIS CODE."
# endif
# elif defined(__NVCOMPILER) // NVHPC (PGI-based, outdated).
# define PYBIND11_BUILD_ABI "" // This was never properly guarded.
# else
# define PYBIND11_BUILD_ABI ""
# error "UNEXPECTED PREPROCESSOR MACROS: PLEASE REVISE THIS CODE."
# endif
#endif

Expand Down