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
1fafd1b4
Unverified
Commit
1fafd1b4
authored
Aug 06, 2021
by
Henry Schreiner
Browse files
fix: apply simpler expression with fewer workarounds
parent
5f4d7259
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
include/pybind11/detail/type_caster_base.h
include/pybind11/detail/type_caster_base.h
+4
-5
No files found.
include/pybind11/detail/type_caster_base.h
View file @
1fafd1b4
...
...
@@ -927,18 +927,17 @@ protected:
using
Constructor
=
void
*
(
*
)(
const
void
*
);
/* Only enabled when the types are {copy,move}-constructible *and* when the type
does not have a private operator new implementation. */
does not have a private operator new implementation. A comma operator is used in the decltype
argument to apply SFINAE to the public copy/move constructors.*/
template
<
typename
T
,
typename
=
enable_if_t
<
is_copy_constructible
<
T
>
::
value
>>
static
auto
make_copy_constructor
(
const
T
*
x
)
->
decltype
(
new
T
(
*
x
),
Constructor
{})
{
PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100
(
x
);
static
auto
make_copy_constructor
(
const
T
*
)
->
decltype
(
new
T
(
std
::
declval
<
const
T
>
()),
Constructor
{})
{
return
[](
const
void
*
arg
)
->
void
*
{
return
new
T
(
*
reinterpret_cast
<
const
T
*>
(
arg
));
};
}
template
<
typename
T
,
typename
=
enable_if_t
<
std
::
is_move_constructible
<
T
>
::
value
>>
static
auto
make_move_constructor
(
const
T
*
x
)
->
decltype
(
new
T
(
std
::
move
(
*
const_cast
<
T
*>
(
x
))),
Constructor
{})
{
PYBIND11_WORKAROUND_INCORRECT_MSVC_C4100
(
x
);
static
auto
make_move_constructor
(
const
T
*
)
->
decltype
(
new
T
(
std
::
declval
<
T
&&>
()),
Constructor
{})
{
return
[](
const
void
*
arg
)
->
void
*
{
return
new
T
(
std
::
move
(
*
const_cast
<
T
*>
(
reinterpret_cast
<
const
T
*>
(
arg
))));
};
...
...
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