Make it work when Python is compiled with Unicode disabled.

dabrahams · dabrahams · commit 3d8f4c90ba4b · 2005-10-14T15:35:06.000Z
[SVN r31321]
diff --git a/include/boost/python/converter/builtin_converters.hpp b/include/boost/python/converter/builtin_converters.hpp
@@ -116,7 +116,7 @@ BOOST_PYTHON_TO_PYTHON_BY_VALUE(unsigned BOOST_PYTHON_LONG_LONG, ::PyLong_FromUn
 BOOST_PYTHON_TO_PYTHON_BY_VALUE(char, converter::do_return_to_python(x))
 BOOST_PYTHON_TO_PYTHON_BY_VALUE(char const*, converter::do_return_to_python(x))
 BOOST_PYTHON_TO_PYTHON_BY_VALUE(std::string, ::PyString_FromStringAndSize(x.data(),implicit_cast<int>(x.size())))
-# ifndef BOOST_NO_STD_WSTRING
+#if defined(Py_USING_UNICODE) && !defined(BOOST_NO_STD_WSTRING)
 BOOST_PYTHON_TO_PYTHON_BY_VALUE(std::wstring, ::PyUnicode_FromWideChar(x.data(),implicit_cast<int>(x.size())))
 # endif 
 BOOST_PYTHON_TO_PYTHON_BY_VALUE(float, ::PyFloat_FromDouble(x))
diff --git a/src/converter/builtin_converters.cpp b/src/converter/builtin_converters.cpp
@@ -278,6 +278,7 @@ namespace
       }
   };
 
+#if defined(Py_USING_UNICODE) && !defined(BOOST_NO_STD_WSTRING)
   // encode_string_unaryfunc/py_encode_string -- manufacture a unaryfunc
   // "slot" which encodes a Python string using the default encoding
   extern "C" PyObject* encode_string_unaryfunc(PyObject* x)
@@ -286,8 +287,6 @@ namespace
   }
   unaryfunc py_encode_string = encode_string_unaryfunc;
 
-
-#ifndef BOOST_NO_STD_WSTRING
   // A SlotPolicy for extracting C++ strings from Python objects.
   struct wstring_rvalue_from_python
   {
@@ -411,8 +410,8 @@ void initialize_builtin_converters()
     // Add an lvalue converter for char which gets us char const*
     registry::insert(convert_to_cstring,type_id<char>());
 
-# ifndef BOOST_NO_STD_WSTRING
     // Register by-value converters to std::string, std::wstring
+#if defined(Py_USING_UNICODE) && !defined(BOOST_NO_STD_WSTRING)
     slot_rvalue_from_python<std::wstring, wstring_rvalue_from_python>();
 # endif 
     slot_rvalue_from_python<std::string, string_rvalue_from_python>();
