[Boost-commit] svn:boost r71226 - in branches/release: boost/python libs/python libs/python/example libs/python/src/converter

Subject: [Boost-commit] svn:boost r71226 - in branches/release: boost/python libs/python libs/python/example libs/python/src/converter
From: rwgk_at_[hidden]
Date: 2011-04-13 13:34:38

Author: rwgk
Date: 2011-04-13 13:34:35 EDT (Wed, 13 Apr 2011)
New Revision: 71226
URL: http://svn.boost.org/trac/boost/changeset/71226

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/libs/python/example/README                       |     1 -                                       
   branches/release/libs/python/src/converter/builtin_converters.cpp |     5 ++++-                                   
   2 files changed, 4 insertions(+), 2 deletions(-)

Modified: branches/release/libs/python/example/README
==============================================================================
--- branches/release/libs/python/example/README	(original)
+++ branches/release/libs/python/example/README	2011-04-13 13:34:35 EDT (Wed, 13 Apr 2011)
@@ -14,4 +14,3 @@
 If you move this example from its place in the Boost development tree
 you'll need to edit the two lines indicated in Jamroot and
 boost-build.jam.
-

Modified: branches/release/libs/python/src/converter/builtin_converters.cpp
==============================================================================
--- branches/release/libs/python/src/converter/builtin_converters.cpp	(original)
+++ branches/release/libs/python/src/converter/builtin_converters.cpp	2011-04-13 13:34:35 EDT (Wed, 13 Apr 2011)
@@ -431,7 +431,10 @@
           if (!result.empty())
           {
               int err = PyUnicode_AsWideChar(
-                  (PyUnicodeObject *)intermediate
+#if PY_VERSION_HEX < 0x03020000
+                  (PyUnicodeObject *)
+#endif
+                    intermediate
                 , &result[0]
                 , result.size());