Skip to content

GitLab

Commit 7bdd74a9 authored by Ivan Smirnov's avatar Ivan Smirnov
Browse files

Fix PYBIND11_DTYPE to work with MSVC compiler

parent 5dc6c544
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
include/pybind11/numpy.h
View file @ 7bdd74a9
...@@ -292,8 +292,15 @@ private: ...@@ -292,8 +292,15 @@ private:
#define PB11_IMPL_MAP_NEXT0(test, next, ...) next PB11_IMPL_MAP_OUT #define PB11_IMPL_MAP_NEXT0(test, next, ...) next PB11_IMPL_MAP_OUT
#define PB11_IMPL_MAP_NEXT1(test, next) PB11_IMPL_MAP_NEXT0 (test, next, 0) #define PB11_IMPL_MAP_NEXT1(test, next) PB11_IMPL_MAP_NEXT0 (test, next, 0)
#define PB11_IMPL_MAP_NEXT(test, next) PB11_IMPL_MAP_NEXT1 (PB11_IMPL_MAP_GET_END test, next) #define PB11_IMPL_MAP_NEXT(test, next) PB11_IMPL_MAP_NEXT1 (PB11_IMPL_MAP_GET_END test, next)
#define PB11_IMPL_MAP_LIST_NEXT1(test, next) PB11_IMPL_MAP_NEXT0 (test, PB11_IMPL_MAP_COMMA next, 0) #ifdef _MSC_VER
#define PB11_IMPL_MAP_LIST_NEXT(test, next) PB11_IMPL_MAP_LIST_NEXT1 (PB11_IMPL_MAP_GET_END test, next) #define PB11_IMPL_MAP_LIST_NEXT1(test, next) \
PB11_IMPL_EVAL0 (PB11_IMPL_MAP_NEXT0 (test, PB11_IMPL_MAP_COMMA next, 0))
#else
#define PB11_IMPL_MAP_LIST_NEXT1(test, next) \
PB11_IMPL_MAP_NEXT0 (test, PB11_IMPL_MAP_COMMA next, 0)
#endif
#define PB11_IMPL_MAP_LIST_NEXT(test, next) \
PB11_IMPL_MAP_LIST_NEXT1 (PB11_IMPL_MAP_GET_END test, next)
#define PB11_IMPL_MAP_LIST0(f, t, x, peek, ...) \ #define PB11_IMPL_MAP_LIST0(f, t, x, peek, ...) \
f(t, x) PB11_IMPL_MAP_LIST_NEXT (peek, PB11_IMPL_MAP_LIST1) (f, t, peek, __VA_ARGS__) f(t, x) PB11_IMPL_MAP_LIST_NEXT (peek, PB11_IMPL_MAP_LIST1) (f, t, peek, __VA_ARGS__)
#define PB11_IMPL_MAP_LIST1(f, t, x, peek, ...) \ #define PB11_IMPL_MAP_LIST1(f, t, x, peek, ...) \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment