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

Detect and fail if using mismatched holders #2644

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Detect and fail if using mismatched holders #2644

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b498e52
Incompatible holder types cause crash (unit test)
jagerman Oct 29, 2017
44f23a2
Detect and fail if using mismatched holders
jagerman Oct 29, 2017
0fe5697
Failing test on mismatching function arguments
rhaschke Oct 20, 2020
6360006
Correctly handle mismatched holders in function arguments
rhaschke Nov 5, 2020
e2aa4ec
Replace global map holders_seen with local holder_type in registered …
rhaschke Nov 6, 2020
502bf24
fixup! Replace global map holders_seen with local holder_type in regi…
rhaschke Nov 6, 2020
7852e7d
Generalize holder compatibility check for derived classes
rhaschke Nov 6, 2020
cde5c11
Relax holder type check
rhaschke Nov 6, 2020
d5c4386
fixup! Replace global map holders_seen with local holder_type in regi…
rhaschke Nov 7, 2020
e57a3db
fixup! fixup! Replace global map holders_seen with local holder_type …
rhaschke Nov 8, 2020
8115384
fixup! fixup! fixup! Replace global map holders_seen with local holde…
rhaschke Nov 9, 2020
02d0b53
Move runtime check for holder compatibility into function registration
rhaschke Nov 23, 2020
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
Prev Previous commit
Next Next commit
fixup! fixup! fixup! Replace global map holders_seen with local holde… 
…r_type in registered type_info

Simplify code using type_id<Return>()
  • Loading branch information
@rhaschke
rhaschke committed Nov 9, 2020
commit 8115384d038eb6fa9f71c4fa51fadf477d6b925d
4 changes: 1 addition & 3 deletions include/pybind11/pybind11.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,7 @@ class cpp_function : public function {
// Fail if the type was previously registered with a different holder type
if (!detail::check_for_holder_mismatch<Return>()) {
// If Return type was not yet registered, check_for_holder_mismatch() returns false w/o raising
std::string tname(typeid(Return).name());
detail::clean_type_id(tname);
pybind11_fail("Cannot register function with not yet registered return type \"" + tname + "\"");
pybind11_fail("Cannot register function with not yet registered return type \"" + type_id<Return>() + "\"");
}

/* Dispatch code which converts function arguments and performs the actual function call */
Expand Down