Skip to content

chore: use much more specific CPP feature flags #6150

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

Open
Skylion007 wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −9
Open

chore: use much more specific CPP feature flags #6150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion include/pybind11/complex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ struct format_descriptor<std::complex<T>, detail::enable_if_t<std::is_floating_p
static std::string format() { return std::string(value); }
};

#ifndef PYBIND11_CPP17
#if !defined(__cpp_inline_variables) || __cpp_inline_variables < 201606L

template <typename T>
constexpr const char
Expand Down
7 changes: 4 additions & 3 deletions include/pybind11/detail/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1202,7 +1202,7 @@ struct format_descriptor<T, detail::enable_if_t<std::is_arithmetic<T>::value>> {
static std::string format() { return std::string(1, c); }
};

#if !defined(PYBIND11_CPP17)
#if !defined(__cpp_inline_variables) || __cpp_inline_variables < 201606L

template <typename T>
constexpr const char
Expand Down Expand Up @@ -1278,7 +1278,7 @@ struct overload_cast_impl {
PYBIND11_NAMESPACE_END(detail)

// overload_cast requires variable templates: C++14
#if defined(PYBIND11_CPP14)
#if defined(__cpp_variable_templates) && __cpp_variable_templates >= 201304L
# define PYBIND11_OVERLOAD_CAST 1
/// Syntax sugar for resolving overloaded function pointers:
/// - regular: static_cast<Return (Class::*)(Arg0, Arg1, Arg2)>(&Class::func)
Expand All @@ -1292,7 +1292,8 @@ static constexpr detail::overload_cast_impl<Args...> overload_cast{};
/// - sweet: overload_cast<Arg>(&Class::func, const_)
static constexpr auto const_ = std::true_type{};

#if !defined(PYBIND11_CPP14) // no overload_cast: providing something that static_assert-fails:
#if !defined(__cpp_variable_templates) || __cpp_variable_templates < 201304L
// No overload_cast: providing something that static_assert-fails.
template <typename... Args>
struct overload_cast {
static_assert(detail::deferred_t<std::false_type, Args...>::value,
Expand Down
6 changes: 3 additions & 3 deletions include/pybind11/detail/init.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ struct factory<Func, void_type (*)(), Return(Args...), void_type()> {
// instance, or the alias needs to be constructible from a `Class &&` argument.
template <typename Class, typename... Extra>
void execute(Class &cl, const Extra &...extra) && {
#if defined(PYBIND11_CPP14)
#if defined(__cpp_init_captures) && __cpp_init_captures >= 201304L
cl.def(
"__init__",
[func = std::move(class_factory)]
Expand Down Expand Up @@ -435,7 +435,7 @@ struct factory<CFunc, AFunc, CReturn(CArgs...), AReturn(AArgs...)> {
static_assert(Class::has_alias,
"The two-argument version of `py::init()` can "
"only be used if the class has an alias");
#if defined(PYBIND11_CPP14)
#if defined(__cpp_init_captures) && __cpp_init_captures >= 201304L
cl.def(
"__init__",
[class_func = std::move(class_factory), alias_func = std::move(alias_factory)]
Expand Down Expand Up @@ -524,7 +524,7 @@ struct pickle_factory<Get, Set, RetState(Self), NewInstance(ArgState)> {
void execute(Class &cl, const Extra &...extra) && {
cl.def("__getstate__", std::move(get), pos_only());

#if defined(PYBIND11_CPP14)
#if defined(__cpp_init_captures) && __cpp_init_captures >= 201304L
cl.def(
"__setstate__",
[func = std::move(set)]
Expand Down
2 changes: 1 addition & 1 deletion include/pybind11/pybind11.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ class ReadableFunctionSignature {

// Prior to C++17, we don't have inline variables, so we have to
// provide an out-of-line definition of the class member.
#if !defined(PYBIND11_CPP17)
#if !defined(__cpp_inline_variables) || __cpp_inline_variables < 201606L
template <typename cast_in, typename cast_out>
constexpr typename ReadableFunctionSignature<cast_in, cast_out>::sig_type
ReadableFunctionSignature<cast_in, cast_out>::kSig;
Expand Down
3 changes: 2 additions & 1 deletion tests/test_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,8 @@ TEST_SUBMODULE(class_, m) {
py::class_<StringWrapper>(m, "StringWrapper").def(py::init<std::string>());
py::implicitly_convertible<std::string, StringWrapper>();

#if defined(PYBIND11_CPP17)
#if (defined(__cpp_aligned_new) && __cpp_aligned_new >= 201606L) \
|| (defined(__INTEL_COMPILER) && __cplusplus >= 201703L)
struct alignas(1024) Aligned {
std::uintptr_t ptr() const { return (uintptr_t) this; }
};
Expand Down
Loading