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

fix bogus return value policy fallbacks (fixes #389)

Browse Source
This commit is contained in:
Wenzel Jakob
2016-09-07 00:47:17 +09:00
parent a3dbdc67f5
commit c84b37b577
3 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/pybind11/cast.h
View File

@@ -220,14 +220,16 @@ public:
policy = return_value_policy::reference;
if (policy == return_value_policy::copy) {
wrapper->value = copy_constructor(wrapper->value);
if (wrapper->value == nullptr)
if (copy_constructor)
wrapper->value = copy_constructor(wrapper->value);
else
throw cast_error("return_value_policy = copy, but the object is non-copyable!");
} else if (policy == return_value_policy::move) {
wrapper->value = move_constructor(wrapper->value);
if (wrapper->value == nullptr)
if (move_constructor)
wrapper->value = move_constructor(wrapper->value);
else if (copy_constructor)
wrapper->value = copy_constructor(wrapper->value);
if (wrapper->value == nullptr)
else
throw cast_error("return_value_policy = move, but the object is neither movable nor copyable!");
} else if (policy == return_value_policy::reference) {
wrapper->owned = false;