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

Allow Windows.h min/max to coexist with pybind11 (#1847)

Browse Source 
* Protect std::min/max functions from windows.h min/max
Removed check for windows min/max
This commit is contained in:
Nathan 2019-07-18 01:01:50 -06:00 committed by Wenzel Jakob
parent b2c4ff6052
commit 9b3fb05326
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/pybind11/cast.h
View File

@ -995,9 +995,11 @@ public:
} }
bool py_err = py_value == (py_type) -1 && PyErr_Occurred(); bool py_err = py_value == (py_type) -1 && PyErr_Occurred();
// Protect std::numeric_limits::min/max with parentheses
if (py_err || (std::is_integral<T>::value && sizeof(py_type) != sizeof(T) && if (py_err || (std::is_integral<T>::value && sizeof(py_type) != sizeof(T) &&
(py_value < (py_type) std::numeric_limits<T>::min() || (py_value < (py_type) (std::numeric_limits<T>::min)() ||
py_value > (py_type) std::numeric_limits<T>::max()))) { py_value > (py_type) (std::numeric_limits<T>::max)()))) {
bool type_error = py_err && PyErr_ExceptionMatches( bool type_error = py_err && PyErr_ExceptionMatches(
#if PY_VERSION_HEX < 0x03000000 && !defined(PYPY_VERSION) #if PY_VERSION_HEX < 0x03000000 && !defined(PYPY_VERSION)
PyExc_SystemError PyExc_SystemError

4
include/pybind11/detail/common.h
View File

@ -113,10 +113,6 @@
#include <frameobject.h> #include <frameobject.h>
#include <pythread.h> #include <pythread.h>
#if defined(_WIN32) && (defined(min) || defined(max))
# error Macro clash with min and max -- define NOMINMAX when compiling your program on Windows
#endif
#if defined(isalnum) #if defined(isalnum)
# undef isalnum # undef isalnum
# undef isalpha # undef isalpha

2
include/pybind11/pybind11.h
View File

@ -495,7 +495,7 @@ protected:
function_call call(func, parent); function_call call(func, parent);
size_t args_to_copy = std::min(pos_args, n_args_in); size_t args_to_copy = (std::min)(pos_args, n_args_in); // Protect std::min with parentheses
size_t args_copied = 0; size_t args_copied = 0;
// 0. Inject new-style `self` argument // 0. Inject new-style `self` argument