diff options
Diffstat (limited to 'common/pybindings.h')
| -rw-r--r-- | common/pybindings.h | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/common/pybindings.h b/common/pybindings.h index 4379a1aa..1f5ca004 100644 --- a/common/pybindings.h +++ b/common/pybindings.h @@ -45,26 +45,18 @@ template <typename T> struct string_wrapper { from_pystring_converter() { - converter::registry::push_back(&convertible, &construct, - boost::python::type_id<T>()); + converter::registry::push_back(&convertible, &construct, boost::python::type_id<T>()); }; - static void *convertible(PyObject *object) - { - return PyUnicode_Check(object) ? object : 0; - } + static void *convertible(PyObject *object) { return PyUnicode_Check(object) ? object : 0; } - static void construct(PyObject *object, - converter::rvalue_from_python_stage1_data *data) + static void construct(PyObject *object, converter::rvalue_from_python_stage1_data *data) { const wchar_t *value = PyUnicode_AsUnicode(object); const std::wstring value_ws(value); if (value == 0) throw_error_already_set(); - void *storage = - ((boost::python::converter::rvalue_from_python_storage<T> *) - data) - ->storage.bytes; + void *storage = ((boost::python::converter::rvalue_from_python_storage<T> *)data)->storage.bytes; new (storage) T(fn(std::string(value_ws.begin(), value_ws.end()))); data->convertible = storage; } @@ -79,8 +71,7 @@ template <typename T> struct string_wrapper std::string str(T &x) { return fn(x); } }; - template <typename F1, typename F2> - static void wrap(const char *type_name, F1 to_str_fn, F2 from_str_fn) + template <typename F1, typename F2> static void wrap(const char *type_name, F1 to_str_fn, F2 from_str_fn) { from_pystring_converter<F2>::fn = from_str_fn; from_pystring_converter<F2>(); |