summaryrefslogtreecommitdiff
path: root/src/mongo/db/geo
diff options
context:
space:
mode:
authorMark Benvenuto <mark.benvenuto@mongodb.com>2016-12-29 14:55:51 -0500
committerMark Benvenuto <mark.benvenuto@mongodb.com>2016-12-29 14:55:51 -0500
commit9ba33ad1fb3a27f24de309da25e84b3175aa4c82 (patch)
treed8f1deec113a099d3950c7b3ca12ab147a429bc7 /src/mongo/db/geo
parent241b64c7bffb9c8cadc9b1a01844833218b0c8f0 (diff)
downloadmongo-9ba33ad1fb3a27f24de309da25e84b3175aa4c82.tar.gz
SERVER-16363 Remove all volatile storage types from server source code
Diffstat (limited to 'src/mongo/db/geo')
-rw-r--r--src/mongo/db/geo/shapes.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/geo/shapes.cpp b/src/mongo/db/geo/shapes.cpp
index 5ccc0fb85d4..94b52f94948 100644
--- a/src/mongo/db/geo/shapes.cpp
+++ b/src/mongo/db/geo/shapes.cpp
@@ -501,7 +501,7 @@ double distanceCompare(const Point& p1, const Point& p2, double radius) {
// inline will make certain geo tests fail. Of course this check will force volatile
// for all 32-bit systems, not just affected systems.
if (sizeof(void*) <= 4) {
- volatile double sum = p2.y > p1.y ? p1.y + radius : p2.y + radius;
+ volatile double sum = p2.y > p1.y ? p1.y + radius : p2.y + radius; // NOLINT
return p2.y > p1.y ? p2.y - sum : p1.y - sum;
} else {
// Original math, correct for most systems
@@ -511,7 +511,7 @@ double distanceCompare(const Point& p1, const Point& p2, double radius) {
if (b == 0) {
if (sizeof(void*) <= 4) {
- volatile double sum = p2.x > p1.x ? p1.x + radius : p2.x + radius;
+ volatile double sum = p2.x > p1.x ? p1.x + radius : p2.x + radius; // NOLINT
return p2.x > p1.x ? p2.x - sum : p1.x - sum;
} else {
return p2.x > p1.x ? p2.x - (p1.x + radius) : p1.x - (p2.x + radius);