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

fix: make PYBIND11_WARNING_POP actually pop clang diagnostics #5448

Merged
merged 10 commits into from
Dec 8, 2024
Merged

fix: make PYBIND11_WARNING_POP actually pop clang diagnostics #5448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d84c495
fix: make PYBIND11_WARNING_POP actually pop clang diagnostics
J-M0 Nov 24, 2024
d310959
fix: ignore -Wgnu-zero-variadic-macro-arguments on clang
J-M0 Nov 28, 2024
1a04f75
Revert "fix: ignore -Wgnu-zero-variadic-macro-arguments on clang"
rwgk Nov 29, 2024
98b035a
C++20 modernization: Use `__VA_OPT__(, ) __VA_ARGS__` in `PYBIND11_DE…
rwgk Nov 29, 2024
5c5dc8b
Disable `__VA_OPT__(, ) __VA_ARGS__` usage for MSVC (it is unclear to…
rwgk Nov 30, 2024
a575ad6
Add `PYBIND11_WARNING_DISABLE_CLANG("-Wgnu-zero-variadic-macro-argume…
rwgk Nov 30, 2024
be2c4cd
Also add `PYBIND11_WARNING_DISABLE_CLANG("-Wgnu-zero-variadic-macro-a…
rwgk Nov 30, 2024
07859ca
Also add `PYBIND11_WARNING_DISABLE_CLANG("-Wgnu-zero-variadic-macro-a…
rwgk Nov 30, 2024
d01e3ef
Undo all changes except the original push -> pop fix.
rwgk Nov 30, 2024
c9ce487
1. Add `PYBIND11_WARNING_DISABLE_CLANG("-Wgnu-zero-variadic-macro-arg…
rwgk Nov 30, 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
10 changes: 6 additions & 4 deletions include/pybind11/cast.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,18 +863,20 @@ using type_caster_holder = conditional_t<is_copy_constructible<holder_type>::val
copyable_holder_caster<type, holder_type>,
move_only_holder_caster<type, holder_type>>;

template <typename T, bool Value = false>
struct always_construct_holder {
template <bool Value = false>
struct always_construct_holder_value {
static constexpr bool value = Value;
};

template <typename T, bool Value = false>
struct always_construct_holder : always_construct_holder_value<Value> {};

/// Create a specialization for custom holder types (silently ignores std::shared_ptr)
#define PYBIND11_DECLARE_HOLDER_TYPE(type, holder_type, ...) \
PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE) \
namespace detail { \
template <typename type> \
struct always_construct_holder<holder_type> : always_construct_holder<void, ##__VA_ARGS__> { \
}; \
struct always_construct_holder<holder_type> : always_construct_holder_value<__VA_ARGS__> {}; \
template <typename type> \
class type_caster<holder_type, enable_if_t<!is_shared_ptr<holder_type>::value>> \
: public type_caster_holder<type, holder_type> {}; \
Expand Down
2 changes: 1 addition & 1 deletion include/pybind11/detail/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
# define PYBIND11_COMPILER_CLANG
# define PYBIND11_PRAGMA(...) _Pragma(#__VA_ARGS__)
# define PYBIND11_WARNING_PUSH PYBIND11_PRAGMA(clang diagnostic push)
# define PYBIND11_WARNING_POP PYBIND11_PRAGMA(clang diagnostic push)
# define PYBIND11_WARNING_POP PYBIND11_PRAGMA(clang diagnostic pop)
#elif defined(__GNUC__)
# define PYBIND11_COMPILER_GCC
# define PYBIND11_PRAGMA(...) _Pragma(#__VA_ARGS__)
Expand Down
6 changes: 6 additions & 0 deletions include/pybind11/pybind11.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@
#include <utility>
#include <vector>

// See PR #5448. This warning suppression is needed for the PYBIND11_OVERRIDE macro family.
// NOTE that this is NOT embedded in a push/pop pair because that is very difficult to achieve.
#if defined(__clang_major__) && __clang_major__ < 14
PYBIND11_WARNING_DISABLE_CLANG("-Wgnu-zero-variadic-macro-arguments")
#endif

#if defined(__cpp_lib_launder) && !(defined(_MSC_VER) && (_MSC_VER < 1914))
# define PYBIND11_STD_LAUNDER std::launder
# define PYBIND11_HAS_STD_LAUNDER 1
Expand Down
Loading