pybind/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2026-05-12 01:10:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Manually fixing merge conflict.

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve
2021-06-22 12:19:40 -07:00
parent 8d1e0b3903 dac74ebdf5
commit 898d5b301c
36 changed files with 663 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/test_multiple_inheritance.cpp
View File

@@ -141,6 +141,7 @@ TEST_SUBMODULE(multiple_inheritance, m) {
.def(py::init<int, int>());
m.def("bar_base2a", [](Base2a *b) { return b->bar(); });
// NOLINTNEXTLINE(performance-unnecessary-value-param)
m.def("bar_base2a_sharedptr", [](std::shared_ptr<Base2a> b) { return b->bar(); });
// test_mi_unaligned_base