From 5412a05cf03dc6472456c6dbc2497d764c952d90 Mon Sep 17 00:00:00 2001 From: Ivan Smirnov Date: Sat, 2 Jul 2016 16:18:42 +0100 Subject: [PATCH] Rename PYBIND11_DTYPE to PYBIND11_NUMPY_DTYPE --- docs/advanced.rst | 6 +++--- example/example20.cpp | 6 +++--- include/pybind11/numpy.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/advanced.rst b/docs/advanced.rst index dca4a29d2..5190e0b77 100644 --- a/docs/advanced.rst +++ b/docs/advanced.rst @@ -1362,7 +1362,7 @@ NumPy structured types ====================== In order for ``py::array_t`` to work with structured (record) types, we first need -to register the memory layout of the type. This can be done via ``PYBIND11_DTYPE`` +to register the memory layout of the type. This can be done via ``PYBIND11_NUMPY_DTYPE`` macro which expects the type followed by field names: .. code-block:: cpp @@ -1377,8 +1377,8 @@ macro which expects the type followed by field names: A a; }; - PYBIND11_DTYPE(A, x, y); - PYBIND11_DTYPE(B, z, a); + PYBIND11_NUMPY_DTYPE(A, x, y); + PYBIND11_NUMPY_DTYPE(B, z, a); /* now both A and B can be used as template arguments to py::array_t */ diff --git a/example/example20.cpp b/example/example20.cpp index 662dc473a..2c24e6dd3 100644 --- a/example/example20.cpp +++ b/example/example20.cpp @@ -101,9 +101,9 @@ void print_dtypes() { } void init_ex20(py::module &m) { - PYBIND11_DTYPE(SimpleStruct, x, y, z); - PYBIND11_DTYPE(PackedStruct, x, y, z); - PYBIND11_DTYPE(NestedStruct, a, b); + PYBIND11_NUMPY_DTYPE(SimpleStruct, x, y, z); + PYBIND11_NUMPY_DTYPE(PackedStruct, x, y, z); + PYBIND11_NUMPY_DTYPE(NestedStruct, a, b); m.def("create_rec_simple", &create_recarray); m.def("create_rec_packed", &create_recarray); diff --git a/include/pybind11/numpy.h b/include/pybind11/numpy.h index 6375e160d..c8854ea7d 100644 --- a/include/pybind11/numpy.h +++ b/include/pybind11/numpy.h @@ -327,7 +327,7 @@ private: #define PYBIND11_MAP_LIST(f, t, ...) \ PYBIND11_EVAL (PYBIND11_MAP_LIST1 (f, t, __VA_ARGS__, (), 0)) -#define PYBIND11_DTYPE(Type, ...) \ +#define PYBIND11_NUMPY_DTYPE(Type, ...) \ ::pybind11::detail::npy_format_descriptor::register_dtype \ ({PYBIND11_MAP_LIST (PYBIND11_FIELD_DESCRIPTOR, Type, __VA_ARGS__)})