diff options
| author | Ted Ross <tross@apache.org> | 2011-01-26 20:21:00 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2011-01-26 20:21:00 +0000 |
| commit | fab618e011e19610bb9be31037465ff1cc70063b (patch) | |
| tree | 164e6606b7ff140bcea12c01c4f7750ff98b780a /cpp | |
| parent | 32d504f99479575f657fcc17842f4941ec196440 (diff) | |
| download | qpid-python-fab618e011e19610bb9be31037465ff1cc70063b.tar.gz | |
Change order of Py<type>_check calls in typemap.
It turns out that PyInt_Check returns 'True' for booleans.
The order of the checks is now from most specific to least.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1063862 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/bindings/swig_python_typemaps.i | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/bindings/swig_python_typemaps.i b/cpp/bindings/swig_python_typemaps.i index a233641940..b69784a6de 100644 --- a/cpp/bindings/swig_python_typemaps.i +++ b/cpp/bindings/swig_python_typemaps.i @@ -32,11 +32,11 @@ typedef int Py_ssize_t; void PyToList(PyObject*, qpid::types::Variant::List*); qpid::types::Variant PyToVariant(PyObject* value) { + if (PyBool_Check(value)) return qpid::types::Variant(bool(PyInt_AS_LONG(value) ? true : false)); if (PyFloat_Check(value)) return qpid::types::Variant(PyFloat_AS_DOUBLE(value)); - if (PyString_Check(value)) return qpid::types::Variant(std::string(PyString_AS_STRING(value))); if (PyInt_Check(value)) return qpid::types::Variant(int64_t(PyInt_AS_LONG(value))); if (PyLong_Check(value)) return qpid::types::Variant(int64_t(PyLong_AsLongLong(value))); - if (PyBool_Check(value)) return qpid::types::Variant(bool(PyInt_AS_LONG(value) ? true : false)); + if (PyString_Check(value)) return qpid::types::Variant(std::string(PyString_AS_STRING(value))); if (PyDict_Check(value)) { qpid::types::Variant::Map map; PyToMap(value, &map); |