Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2025-02-21 16:09:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor cleanups in numpy.h, updated gitignore file for ninja

Browse Source
This commit is contained in:
Wenzel Jakob 2016-01-17 22:36:37 +01:00
parent 8a49f776b5
commit 36dec17883
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -20,3 +20,6 @@ CTestTestfile.cmake
Testing Testing
autogen autogen
MANIFEST MANIFEST
/.ninja_*
/*.ninja
/docs/.build

6
include/pybind11/numpy.h
View File

@ -32,9 +32,9 @@ public:
API_PyArray_NewFromDescr = 94, API_PyArray_NewFromDescr = 94,
NPY_C_CONTIGUOUS = 0x0001, NPY_C_CONTIGUOUS = 0x0001,
NPY_F_CONTIGUOUS = 0x0002, NPY_F_CONTIGUOUS = 0x0002,
NPY_NPY_ARRAY_FORCECAST = 0x0010, NPY_ARRAY_FORCECAST = 0x0010,
NPY_ENSURE_ARRAY = 0x0040, NPY_ENSURE_ARRAY = 0x0040,
NPY_BOOL=0, NPY_BOOL = 0,
NPY_BYTE, NPY_UBYTE, NPY_BYTE, NPY_UBYTE,
NPY_SHORT, NPY_USHORT, NPY_SHORT, NPY_USHORT,
NPY_INT, NPY_UINT, NPY_INT, NPY_UINT,
@ -136,7 +136,7 @@ public:
PyObject *descr = api.PyArray_DescrFromType(npy_format_descriptor<T>::value); PyObject *descr = api.PyArray_DescrFromType(npy_format_descriptor<T>::value);
return api.PyArray_FromAny(ptr, descr, 0, 0, return api.PyArray_FromAny(ptr, descr, 0, 0,
API::NPY_C_CONTIGUOUS | API::NPY_ENSURE_ARRAY | API::NPY_C_CONTIGUOUS | API::NPY_ENSURE_ARRAY |
API::NPY_NPY_ARRAY_FORCECAST, nullptr); API::NPY_ARRAY_FORCECAST, nullptr);
} }
}; };