diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-06-17 15:54:01 +0200 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-06-17 15:54:01 +0200 |
| commit | 3b0e6e41098557dab9fe7ca5c59f2863fd671b94 (patch) | |
| tree | b8fb3c1fb387986cd39d4dc291845cd51d2796e5 /sql/spatial.h | |
| parent | 689901f36f13b0ad5fe908998625493814ed33fa (diff) | |
| download | mariadb-git-3b0e6e41098557dab9fe7ca5c59f2863fd671b94.tar.gz | |
Bug #43414 Parenthesis (and other) warnings compiling MySQL
with gcc 4.3.2
Compiling MySQL with gcc 4.3.2 and later produces a number of
warnings, many of which are new with the recent compiler
versions.
This bug will be resolved in more than one patch to limit the
size of changesets. This is the second patch, fixing more
of the warnings.
Diffstat (limited to 'sql/spatial.h')
| -rw-r--r-- | sql/spatial.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/spatial.h b/sql/spatial.h index 837ae153310..07aba4f925f 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))) || - (((mbr->ymin == ymax) || (mbr->ymax == ymin)) && - ((mbr->xmin >= xmin) && (mbr->xmin <= xmax) || - (mbr->xmax >= xmin) && (mbr->xmax <= xmax)))); + 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))); } int within(const MBR *mbr) |