Skip to content
Merged
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions include/boost/python/object/class_metadata.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ struct class_metadata
>::type held_type;

// Determine if the object will be held by value
typedef is_convertible<held_type*,T*> use_value_holder;
typedef mpl::bool_<is_convertible<held_type*,T*>::value> use_value_holder;

// Compute the "wrapped type", that is, if held_type is a smart
// pointer, we're talking about the pointee.
Expand All @@ -175,10 +175,12 @@ struct class_metadata
>::type wrapped;

// Determine whether to use a "back-reference holder"
typedef mpl::or_<
has_back_reference<T>
, is_same<held_type_arg,T>
, is_base_and_derived<T,wrapped>
typedef mpl::bool_<
mpl::or_<
has_back_reference<T>
, is_same<held_type_arg,T>
, is_base_and_derived<T,wrapped>
>::value
> use_back_reference;

// Select the holder.
Expand Down