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
4c1a6be4
"vscode:/vscode.git/clone" did not exist on "e763f046899ce09bf8a586ea75a7d9a9d27e70e4"
Commit
4c1a6be4
authored
Jan 17, 2016
by
Wenzel Jakob
Browse files
minor cleanups in numpy.h, updated gitignore file for ninja
parent
6eb11da9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
.gitignore
.gitignore
+3
-0
include/pybind11/numpy.h
include/pybind11/numpy.h
+3
-3
No files found.
.gitignore
View file @
4c1a6be4
...
...
@@ -20,3 +20,6 @@ CTestTestfile.cmake
Testing
autogen
MANIFEST
/.ninja_*
/*.ninja
/docs/.build
include/pybind11/numpy.h
View file @
4c1a6be4
...
...
@@ -32,9 +32,9 @@ public:
API_PyArray_NewFromDescr
=
94
,
NPY_C_CONTIGUOUS
=
0x0001
,
NPY_F_CONTIGUOUS
=
0x0002
,
NPY_
NPY_ARRAY_FORCECAST
=
0x0010
,
NPY_ARRAY_FORCECAST
=
0x0010
,
NPY_ENSURE_ARRAY
=
0x0040
,
NPY_BOOL
=
0
,
NPY_BOOL
=
0
,
NPY_BYTE
,
NPY_UBYTE
,
NPY_SHORT
,
NPY_USHORT
,
NPY_INT
,
NPY_UINT
,
...
...
@@ -136,7 +136,7 @@ public:
PyObject
*
descr
=
api
.
PyArray_DescrFromType
(
npy_format_descriptor
<
T
>::
value
);
return
api
.
PyArray_FromAny
(
ptr
,
descr
,
0
,
0
,
API
::
NPY_C_CONTIGUOUS
|
API
::
NPY_ENSURE_ARRAY
|
API
::
NPY_
NPY_
ARRAY_FORCECAST
,
nullptr
);
API
::
NPY_ARRAY_FORCECAST
,
nullptr
);
}
};
...
...
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