Rename PYBIND11_DTYPE to PYBIND11_NUMPY_DTYPE
diff --git a/docs/advanced.rst b/docs/advanced.rst
index dca4a29..5190e0b 100644
--- a/docs/advanced.rst
+++ b/docs/advanced.rst
@@ -1362,7 +1362,7 @@
======================
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 @@
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 662dc47..2c24e6d 100644
--- a/example/example20.cpp
+++ b/example/example20.cpp
@@ -101,9 +101,9 @@
}
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<SimpleStruct>);
m.def("create_rec_packed", &create_recarray<PackedStruct>);
diff --git a/include/pybind11/numpy.h b/include/pybind11/numpy.h
index 6375e16..c8854ea 100644
--- a/include/pybind11/numpy.h
+++ b/include/pybind11/numpy.h
@@ -327,7 +327,7 @@
#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<Type>::register_dtype \
({PYBIND11_MAP_LIST (PYBIND11_FIELD_DESCRIPTOR, Type, __VA_ARGS__)})