From c54acdb9db325050bd42cd4475d2f226da9dd5e2 Mon Sep 17 00:00:00 2001 From: Gennaro Prota Date: Mon, 24 Jul 2006 22:06:09 +0000 Subject: [PATCH] (merge from head) minor fix: violation of min/max guidelines [SVN r34718] --- include/boost/python/with_custodian_and_ward.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/python/with_custodian_and_ward.hpp b/include/boost/python/with_custodian_and_ward.hpp index 11ee79d1..906de6d7 100644 --- 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(