[Boost-commit] svn:boost r67446 - in branches/release: boost/python boost/python/converter libs/python

Subject: [Boost-commit] svn:boost r67446 - in branches/release: boost/python boost/python/converter libs/python
From: rwgk_at_[hidden]
Date: 2010-12-24 12:31:10

Author: rwgk
Date: 2010-12-24 12:31:05 EST (Fri, 24 Dec 2010)
New Revision: 67446
URL: http://svn.boost.org/trac/boost/changeset/67446

Log:
merging current boost/python and libs/python from trunk into release branch
Properties modified: 
   branches/release/boost/python/   (props changed)
   branches/release/libs/python/   (props changed)
Text files modified: 
   branches/release/boost/python/converter/builtin_converters.hpp |     2 +-                                      
   1 files changed, 1 insertions(+), 1 deletions(-)

Modified: branches/release/boost/python/converter/builtin_converters.hpp
==============================================================================
--- branches/release/boost/python/converter/builtin_converters.hpp	(original)
+++ branches/release/boost/python/converter/builtin_converters.hpp	2010-12-24 12:31:05 EST (Fri, 24 Dec 2010)
@@ -122,7 +122,7 @@
 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