Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-26 15:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prefix the FIELD_DESCRIPTOR macro

Browse Source
This commit is contained in:
Ivan Smirnov 2016-06-26 16:18:46 +01:00
parent 5e71e17bdf
commit 95e9b12322
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/pybind11/numpy.h
View File

@ -267,7 +267,7 @@ private:
static inline char* format_() { static char s[4096]; return s; }
};
#define FIELD_DESCRIPTOR(Type, Field) \
#define PB11_IMPL_FIELD_DESCRIPTOR(Type, Field) \
::pybind11::detail::field_descriptor { \
#Field, offsetof(Type, Field), \
::pybind11::detail::npy_format_descriptor<decltype(static_cast<Type*>(0)->Field)>::descr() \
@ -298,7 +298,7 @@ private:
#define PYBIND11_DTYPE(Type, ...) \
::pybind11::detail::npy_format_descriptor<Type>::register_dtype \
({PB11_IMPL_MAP_LIST(FIELD_DESCRIPTOR, Type, __VA_ARGS__)})
({PB11_IMPL_MAP_LIST(PB11_IMPL_FIELD_DESCRIPTOR, Type, __VA_ARGS__)})
template <class T>
using array_iterator = typename std::add_pointer<T>::type;