From efcd2833f161c8c2e29536bb8e44e3db2323ec21 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Wed, 11 Jan 2006 19:58:55 +0000 Subject: [PATCH] Visual C++ 6 compatibility [SVN r32288] --- include/boost/python/with_custodian_and_ward.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/boost/python/with_custodian_and_ward.hpp b/include/boost/python/with_custodian_and_ward.hpp index cb44cf04..11ee79d1 100644 --- a/include/boost/python/with_custodian_and_ward.hpp +++ b/include/boost/python/with_custodian_and_ward.hpp @@ -84,10 +84,14 @@ struct with_custodian_and_ward_postcall : BasePolicy_ static PyObject* postcall(ArgumentPackage const& args_, PyObject* result) { std::size_t arity_ = detail::arity(args_); +#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) + if ( custodian > arity_ || ward > arity_ ) +#else // 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_ ) +#endif { PyErr_SetString( PyExc_IndexError