From 28081fc8c8e861477b83cddd145ab32299acf344 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Sun, 24 Nov 2024 12:45:11 -0800 Subject: [PATCH] Change `usecxx11` to `use_cxx11_abi` for correspondence with `_GLIBCXX_USE_CXX11_ABI` (similarly to `gxx_abi` for `__GXX_ABI_VERSION`). --- include/pybind11/conduit/pybind11_platform_abi_id.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/pybind11/conduit/pybind11_platform_abi_id.h b/include/pybind11/conduit/pybind11_platform_abi_id.h index 7e9b801d3..d7c016892 100644 --- a/include/pybind11/conduit/pybind11_platform_abi_id.h +++ b/include/pybind11/conduit/pybind11_platform_abi_id.h @@ -77,10 +77,11 @@ # elif defined(__GXX_ABI_VERSION) # if __GXX_ABI_VERSION >= 1002 && __GXX_ABI_VERSION < 2000 # if !defined(_GLIBCXX_USE_CXX11_ABI) -# error "UNEXPECTED: _GLIBCXX_USE_CXX11_ABI not defined" +# error "UNEXPECTED: _GLIBCXX_USE_CXX11_ABI not defined: PLEASE REVISE THIS CODE." # endif # define PYBIND11_BUILD_ABI \ - "_gxx_abi_1xxx_usecxx11_" PYBIND11_PLATFORM_ABI_ID_TOSTRING(_GLIBCXX_USE_CXX11_ABI) + "_gxx_abi_1xxx_use_cxx11_abi_" PYBIND11_PLATFORM_ABI_ID_TOSTRING( \ + _GLIBCXX_USE_CXX11_ABI) # else # error "Unknown platform or compiler (__GXX_ABI_VERSION): PLEASE REVISE THIS CODE." # endif