Commit d7e208c7 by Wenzel Jakob Committed by GitHub

Merge pull request #260 from hbruintjes/allow_const_shared

Allow std::enable_shared_from_this when using const element type
parents 5766c3a6 70d2e57b
......@@ -887,7 +887,7 @@ private:
template <typename T>
static void init_holder_helper(instance_type *inst, const holder_type * /* unused */, const std::enable_shared_from_this<T> * /* dummy */) {
try {
new (&inst->holder) holder_type(std::static_pointer_cast<type>(inst->value->shared_from_this()));
new (&inst->holder) holder_type(std::static_pointer_cast<typename holder_type::element_type>(inst->value->shared_from_this()));
} catch (const std::bad_weak_ptr &) {
new (&inst->holder) holder_type(inst->value);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment