diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2008-12-16 10:12:22 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2008-12-16 10:12:22 -0200 |
| commit | 4bdb3d87fa3bfbbafed984c3c03c5ac609d9797b (patch) | |
| tree | c93d4234e3d8d278b91319b97e252f86a083eb0d /sql/spatial.h | |
| parent | 6e36c50b4d1699ac8add0fc5be5998e3d6fe11b8 (diff) | |
| download | mariadb-git-4bdb3d87fa3bfbbafed984c3c03c5ac609d9797b.tar.gz | |
Fix warnings and bug spotted by gcc-4.3.
Related to operator precedence and associativity.
Make the expressions as explicit as possible.
Diffstat (limited to 'sql/spatial.h')
| -rw-r--r-- | sql/spatial.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/spatial.h b/sql/spatial.h index f806861290e..69a1f24506e 100644 --- a/sql/spatial.h +++ b/sql/spatial.h @@ -116,12 +116,12 @@ struct MBR int touches(const MBR *mbr) { /* The following should be safe, even if we compare doubles */ - return ((((mbr->xmin == xmax) || (mbr->xmax == xmin)) && - ((mbr->ymin >= ymin) && (mbr->ymin <= ymax) || - (mbr->ymax >= ymin) && (mbr->ymax <= ymax))) || + return ((((mbr->xmin == xmax) || (mbr->xmax == xmin)) && + (((mbr->ymin >= ymin) && (mbr->ymin <= ymax)) || + ((mbr->ymax >= ymin) && (mbr->ymax <= ymax)))) || (((mbr->ymin == ymax) || (mbr->ymax == ymin)) && - ((mbr->xmin >= xmin) && (mbr->xmin <= xmax) || - (mbr->xmax >= xmin) && (mbr->xmax <= xmax)))); + (((mbr->xmin >= xmin) && (mbr->xmin <= xmax)) || + ((mbr->xmax >= xmin) && (mbr->xmax <= xmax))))); } int within(const MBR *mbr) |