diff options
| author | John Wiegley <johnw@newartisans.com> | 2012-05-15 00:22:00 -0600 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2012-05-15 00:22:00 -0600 |
| commit | 72dd4d85bdd1f6da79dee405366311e6da96776b (patch) | |
| tree | e3e0a0d6bb7bec06505965da4e845e12bbc63971 /src/pyutils.h | |
| parent | 64a9b42381c26baf24e58b40f50f0b253e551811 (diff) | |
| parent | 96172669053bbba7263a370f109f70615049a0c6 (diff) | |
| download | ledger-72dd4d85bdd1f6da79dee405366311e6da96776b.tar.gz ledger-72dd4d85bdd1f6da79dee405366311e6da96776b.tar.bz2 ledger-72dd4d85bdd1f6da79dee405366311e6da96776b.zip | |
Merge branch 'release/v3.0.0-20120510'
Diffstat (limited to 'src/pyutils.h')
| -rw-r--r-- | src/pyutils.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/pyutils.h b/src/pyutils.h index 44bb6d90..2c7dfaeb 100644 --- a/src/pyutils.h +++ b/src/pyutils.h @@ -180,7 +180,9 @@ namespace boost { namespace python { BOOST_PYTHON_RETURN_TO_PYTHON_BY_VALUE(T,expr, pytype) \ BOOST_PYTHON_ARG_TO_PYTHON_BY_VALUE(T,expr) +#if !defined(HAVE_CPP11) && (defined(VERIFY_ON) || defined(HAVE_BOOST_PYTHON)) BOOST_PYTHON_TO_PYTHON_BY_VALUE(ledger::string, ::PyUnicode_FromEncodedObject(::PyString_FromString(x.c_str()), "UTF-8", NULL), &PyUnicode_Type) +#endif } } // namespace boost::python |