Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
pybind11
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open
pybind11
Commits
309a85ba
Commit
309a85ba
authored
Mar 08, 2016
by
Wenzel Jakob
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
support std::shared_ptr<const X> and types that indirectly derive from std::enable_shared_from_this
parent
fdc00f50
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
include/pybind11/cast.h
+2
-2
include/pybind11/pybind11.h
+1
-1
No files found.
include/pybind11/cast.h
View file @
309a85ba
...
...
@@ -204,7 +204,7 @@ public:
protected
:
template
<
typename
T
=
type
,
typename
std
::
enable_if
<
detail
::
is_copy_constructible
<
T
>::
value
,
int
>::
type
=
0
>
static
void
*
copy_constructor
(
const
void
*
arg
)
{
return
new
type
(
*
((
const
type
*
)
arg
));
return
(
void
*
)
new
type
(
*
((
const
type
*
)
arg
));
}
template
<
typename
T
=
type
,
typename
std
::
enable_if
<!
detail
::
is_copy_constructible
<
T
>::
value
,
int
>::
type
=
0
>
static
void
*
copy_constructor
(
const
void
*
)
{
return
nullptr
;
}
...
...
@@ -508,7 +508,7 @@ public:
return
true
;
}
else
if
(
PyType_IsSubtype
(
Py_TYPE
(
src
.
ptr
()),
typeinfo
->
type
))
{
auto
inst
=
(
instance
<
type
,
holder_type
>
*
)
src
.
ptr
();
value
=
inst
->
value
;
value
=
(
void
*
)
inst
->
value
;
holder
=
inst
->
holder
;
return
true
;
}
...
...
include/pybind11/pybind11.h
View file @
309a85ba
...
...
@@ -864,7 +864,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
(
inst
->
value
->
shared_from_this
(
));
new
(
&
inst
->
holder
)
holder_type
(
std
::
static_pointer_cast
<
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