diff options
| author | Miodrag Milanović <mmicko@gmail.com> | 2021-01-02 11:16:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-02 11:16:49 +0100 |
| commit | 9b9628047c01a970cfe20f83f2b7129ed109440d (patch) | |
| tree | 1db418e9a889dc6fbe6199c5259aac9bd8cbb32f /3rdparty/pybind11/tests/test_multiple_inheritance.cpp | |
| parent | c6cdf30501dcb2da01361229dd66a05dad73a132 (diff) | |
| parent | 61b07bc9a664d6a88b85aae99f9756d7569688a9 (diff) | |
| download | nextpnr-9b9628047c01a970cfe20f83f2b7129ed109440d.tar.gz nextpnr-9b9628047c01a970cfe20f83f2b7129ed109440d.tar.bz2 nextpnr-9b9628047c01a970cfe20f83f2b7129ed109440d.zip | |
Merge pull request #549 from YosysHQ/update
Update pybind11 version and fix for future python versions
Diffstat (limited to '3rdparty/pybind11/tests/test_multiple_inheritance.cpp')
| -rw-r--r-- | 3rdparty/pybind11/tests/test_multiple_inheritance.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/3rdparty/pybind11/tests/test_multiple_inheritance.cpp b/3rdparty/pybind11/tests/test_multiple_inheritance.cpp index ba1674fb..e6720080 100644 --- a/3rdparty/pybind11/tests/test_multiple_inheritance.cpp +++ b/3rdparty/pybind11/tests/test_multiple_inheritance.cpp @@ -193,14 +193,12 @@ TEST_SUBMODULE(multiple_inheritance, m) { .def_readwrite_static("static_value", &VanillaStaticMix2::static_value); -#if !defined(PYPY_VERSION) struct WithDict { }; struct VanillaDictMix1 : Vanilla, WithDict { }; struct VanillaDictMix2 : WithDict, Vanilla { }; py::class_<WithDict>(m, "WithDict", py::dynamic_attr()).def(py::init<>()); py::class_<VanillaDictMix1, Vanilla, WithDict>(m, "VanillaDictMix1").def(py::init<>()); py::class_<VanillaDictMix2, WithDict, Vanilla>(m, "VanillaDictMix2").def(py::init<>()); -#endif // test_diamond_inheritance // Issue #959: segfault when constructing diamond inheritance instance |