diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-08-22 19:56:47 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-08-22 19:56:47 (GMT) |
| commit | e9cf5e3495c482f9e29f90544d6c0479893eef0a (patch) | |
| tree | 1be9e8d655f4ac3638b09bc16efae00b76ce9f02 | |
| parent | 6144bee2289587271ecc036c760f4ba6aa48940b (diff) | |
| download | cpython-e9cf5e3495c482f9e29f90544d6c0479893eef0a.zip cpython-e9cf5e3495c482f9e29f90544d6c0479893eef0a.tar.gz cpython-e9cf5e3495c482f9e29f90544d6c0479893eef0a.tar.bz2 | |
Merged revisions 65978 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65978 | christian.heimes | 2008-08-22 21:55:54 +0200 (Fri, 22 Aug 2008) | 3 lines
Silenced a compiler warning in the sqlite module
Modules/_sqlite/row.c:187: warning: suggest parentheses around && within ||
Reviewed by Benjamin Peterson
........
| -rw-r--r-- | Modules/_sqlite/row.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_sqlite/row.c b/Modules/_sqlite/row.c index 8778af0..d357efa 100644 --- a/Modules/_sqlite/row.c +++ b/Modules/_sqlite/row.c @@ -178,8 +178,8 @@ static PyObject* pysqlite_row_richcompare(pysqlite_Row *self, PyObject *_other, if (PyType_IsSubtype(Py_TYPE(_other), &pysqlite_RowType)) { pysqlite_Row *other = (pysqlite_Row *)_other; PyObject *res = PyObject_RichCompare(self->description, other->description, opid); - if (opid == Py_EQ && res == Py_True - || opid == Py_NE && res == Py_False) { + if ((opid == Py_EQ && res == Py_True) + || (opid == Py_NE && res == Py_False)) { Py_DECREF(res); return PyObject_RichCompare(self->data, other->data, opid); } |