Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
eigenpy
Commits
319b4ed2
Unverified
Commit
319b4ed2
authored
Mar 20, 2020
by
Justin Carpentier
Committed by
GitHub
Mar 20, 2020
Browse files
Merge pull request #173 from gabrielebndn/topic/fixwarnings
Remove silly warnings
parents
2bd99645
c2948738
Changes
1
Show whitespace changes
Inline
Side-by-side
include/eigenpy/numpy-allocator.hpp
View file @
319b4ed2
...
...
@@ -20,7 +20,7 @@ namespace eigenpy
{
typedef
typename
SimilarMatrixType
::
Scalar
Scalar
;
PyArrayObject
*
pyArray
=
(
PyArrayObject
*
)
call_PyArray_SimpleNew
(
nd
,
shape
,
PyArrayObject
*
pyArray
=
(
PyArrayObject
*
)
call_PyArray_SimpleNew
(
static_cast
<
int
>
(
nd
)
,
shape
,
NumpyEquivalentType
<
Scalar
>::
type_code
);
// Copy data
...
...
@@ -42,7 +42,7 @@ namespace eigenpy
if
(
NumpyType
::
sharedMemory
())
{
PyArrayObject
*
pyArray
=
(
PyArrayObject
*
)
call_PyArray_New
(
nd
,
shape
,
PyArrayObject
*
pyArray
=
(
PyArrayObject
*
)
call_PyArray_New
(
static_cast
<
int
>
(
nd
)
,
shape
,
NumpyEquivalentType
<
Scalar
>::
type_code
,
mat
.
data
(),
NPY_ARRAY_MEMORY_CONTIGUOUS
|
NPY_ARRAY_ALIGNED
);
...
...
@@ -77,7 +77,7 @@ namespace eigenpy
if
(
NumpyType
::
sharedMemory
())
{
PyArrayObject
*
pyArray
=
(
PyArrayObject
*
)
call_PyArray_New
(
nd
,
shape
,
PyArrayObject
*
pyArray
=
(
PyArrayObject
*
)
call_PyArray_New
(
static_cast
<
int
>
(
nd
)
,
shape
,
NumpyEquivalentType
<
Scalar
>::
type_code
,
const_cast
<
SimilarMatrixType
&>
(
mat
.
derived
()).
data
(),
NPY_ARRAY_MEMORY_CONTIGUOUS_RO
|
NPY_ARRAY_ALIGNED
);
...
...
Write
Preview
Supports
Markdown
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