Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gaoqiong
pybind11
Commits
d7e208c7
Commit
d7e208c7
authored
Jul 01, 2016
by
Wenzel Jakob
Committed by
GitHub
Jul 01, 2016
Browse files
Merge pull request #260 from hbruintjes/allow_const_shared
Allow std::enable_shared_from_this when using const element type
parents
5766c3a6
70d2e57b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
include/pybind11/pybind11.h
include/pybind11/pybind11.h
+1
-1
No files found.
include/pybind11/pybind11.h
View file @
d7e208c7
...
...
@@ -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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment