Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-24 22:25:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pointer to reference error in type_caster on MSVC (#583)

Browse Source
This commit is contained in:
Dean Moldovan 2017-01-03 11:52:05 +01:00 committed by Wenzel Jakob
parent a84d1c7b32
commit d5df842b12
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/pybind11/cast.h
View File

@ -1015,14 +1015,14 @@ template <typename T> struct move_always<T, enable_if_t<all_of<
move_is_plain_type<T>, move_is_plain_type<T>,
negation<std::is_copy_constructible<T>>, negation<std::is_copy_constructible<T>>,
std::is_move_constructible<T>, std::is_move_constructible<T>,
std::is_same<decltype(std::declval<type_caster<T>>().operator T&()), T&> std::is_same<decltype(std::declval<make_caster<T>>().operator T&()), T&>
>::value>> : std::true_type {}; >::value>> : std::true_type {};
template <typename T, typename SFINAE = void> struct move_if_unreferenced : std::false_type {}; template <typename T, typename SFINAE = void> struct move_if_unreferenced : std::false_type {};
template <typename T> struct move_if_unreferenced<T, enable_if_t<all_of< template <typename T> struct move_if_unreferenced<T, enable_if_t<all_of<
move_is_plain_type<T>, move_is_plain_type<T>,
negation<move_always<T>>, negation<move_always<T>>,
std::is_move_constructible<T>, std::is_move_constructible<T>,
std::is_same<decltype(std::declval<type_caster<T>>().operator T&()), T&> std::is_same<decltype(std::declval<make_caster<T>>().operator T&()), T&>
>::value>> : std::true_type {}; >::value>> : std::true_type {};
template <typename T> using move_never = none_of<move_always<T>, move_if_unreferenced<T>>; template <typename T> using move_never = none_of<move_always<T>, move_if_unreferenced<T>>;

4
include/pybind11/eigen.h
View File

@ -137,7 +137,7 @@ struct type_caster<Eigen::Ref<CVDerived, Options, StrideType>> {
protected: protected:
using Type = Eigen::Ref<CVDerived, Options, StrideType>; using Type = Eigen::Ref<CVDerived, Options, StrideType>;
using Derived = typename std::remove_const<CVDerived>::type; using Derived = typename std::remove_const<CVDerived>::type;
using DerivedCaster = type_caster<Derived>; using DerivedCaster = make_caster<Derived>;
DerivedCaster derived_caster; DerivedCaster derived_caster;
std::unique_ptr<Type> value; std::unique_ptr<Type> value;
public: public:
@ -158,7 +158,7 @@ template <typename Type>
struct type_caster<Type, enable_if_t<is_eigen_base<Type>::value && !is_eigen_ref<Type>::value>> { struct type_caster<Type, enable_if_t<is_eigen_base<Type>::value && !is_eigen_ref<Type>::value>> {
protected: protected:
using Matrix = Eigen::Matrix<typename Type::Scalar, Eigen::Dynamic, Eigen::Dynamic>; using Matrix = Eigen::Matrix<typename Type::Scalar, Eigen::Dynamic, Eigen::Dynamic>;
using MatrixCaster = type_caster<Matrix>; using MatrixCaster = make_caster<Matrix>;
public: public:
[[noreturn]] bool load(handle, bool) { pybind11_fail("Unable to load() into specialized EigenBase object"); } [[noreturn]] bool load(handle, bool) { pybind11_fail("Unable to load() into specialized EigenBase object"); }
static handle cast(const Type &src, return_value_policy policy, handle parent) { return MatrixCaster::cast(Matrix(src), policy, parent); } static handle cast(const Type &src, return_value_policy policy, handle parent) { return MatrixCaster::cast(Matrix(src), policy, parent); }

2
include/pybind11/functional.h
View File

@ -73,7 +73,7 @@ public:
PYBIND11_TYPE_CASTER(type, _("Callable[[") + PYBIND11_TYPE_CASTER(type, _("Callable[[") +
argument_loader<Args...>::arg_names() + _("], ") + argument_loader<Args...>::arg_names() + _("], ") +
type_caster<retval_type>::name() + make_caster<retval_type>::name() +
_("]")); _("]"));
}; };

2
include/pybind11/numpy.h
View File

@ -1140,7 +1140,7 @@ struct vectorize_helper {
}; };
template <typename T, int Flags> struct handle_type_name<array_t<T, Flags>> { template <typename T, int Flags> struct handle_type_name<array_t<T, Flags>> {
static PYBIND11_DESCR name() { return _("numpy.ndarray[") + type_caster<T>::name() + _("]"); } static PYBIND11_DESCR name() { return _("numpy.ndarray[") + make_caster<T>::name() + _("]"); }
}; };
NAMESPACE_END(detail) NAMESPACE_END(detail)

4
include/pybind11/pybind11.h
View File

@ -1076,7 +1076,7 @@ public:
struct capture { Func func; }; struct capture { Func func; };
capture *ptr = new capture { std::forward<Func>(func) }; capture *ptr = new capture { std::forward<Func>(func) };
install_buffer_funcs([](PyObject *obj, void *ptr) -> buffer_info* { install_buffer_funcs([](PyObject *obj, void *ptr) -> buffer_info* {
detail::type_caster<type> caster; detail::make_caster<type> caster;
if (!caster.load(obj, false)) if (!caster.load(obj, false))
return nullptr; return nullptr;
return new buffer_info(((capture *) ptr)->func(caster)); return new buffer_info(((capture *) ptr)->func(caster));
@ -1480,7 +1480,7 @@ template <return_value_policy Policy = return_value_policy::reference_internal,
template <typename InputType, typename OutputType> void implicitly_convertible() { template <typename InputType, typename OutputType> void implicitly_convertible() {
auto implicit_caster = [](PyObject *obj, PyTypeObject *type) -> PyObject * { auto implicit_caster = [](PyObject *obj, PyTypeObject *type) -> PyObject * {
if (!detail::type_caster<InputType>().load(obj, false)) if (!detail::make_caster<InputType>().load(obj, false))
return nullptr; return nullptr;
tuple args(1); tuple args(1);
args[0] = obj; args[0] = obj;