From 736ba48c2b02514765903346d7261539ace71963 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Fri, 24 Dec 2010 17:31:05 +0000 Subject: [PATCH] merging current boost/python and libs/python from trunk into release branch [SVN r67446] --- include/boost/python/converter/builtin_converters.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/python/converter/builtin_converters.hpp b/include/boost/python/converter/builtin_converters.hpp index 978f4f1f..c2e01c03 100644 --- a/include/boost/python/converter/builtin_converters.hpp +++ b/include/boost/python/converter/builtin_converters.hpp @@ -122,7 +122,7 @@ BOOST_PYTHON_TO_INT(short) BOOST_PYTHON_TO_INT(int) BOOST_PYTHON_TO_INT(long) -# if defined(_MSC_VER) && defined(_WIN64) +# if defined(_MSC_VER) && defined(_WIN64) && PY_VERSION_HEX < 0x03000000 /* Under 64-bit Windows std::size_t is "unsigned long long". To avoid getting a Python long for each std::size_t the value is checked before the conversion. A std::size_t is converted to a simple Python int