(merge from head)

minor fix: violation of min/max guidelines [SVN r34718]
2026-01-22 17:32:55 +00:00 · 2006-07-24 22:06:09 +00:00
parent 489dae2b58
commit c54acdb9db
1 changed files with 1 additions and 1 deletions
--- a/include/boost/python/with_custodian_and_ward.hpp
+++ b/include/boost/python/with_custodian_and_ward.hpp
@@ -90,7 +90,7 @@ struct with_custodian_and_ward_postcall : BasePolicy_
        // check if either custodian or ward exceeds the arity
        // (this weird formulation avoids "always false" warnings
        // for arity_ = 0)
-        if ( std::max(custodian, ward) > arity_ )
+        if ( (std::max)(custodian, ward) > arity_ )
 #endif
        {
            PyErr_SetString(