diff options
| author | Mathias Stearn <mathias@10gen.com> | 2017-07-14 15:06:39 -0400 |
|---|---|---|
| committer | Mathias Stearn <mathias@10gen.com> | 2017-07-14 15:06:39 -0400 |
| commit | a9a2772d214b6839ebffaa8c547c1628ffe62e99 (patch) | |
| tree | a8196bf645fb2d97ff264b2228e6cfd3741adc8d /src/third_party/s2/util | |
| parent | 3848e767426d616253f022578db75cc384e3ff1d (diff) | |
| download | mongo-a9a2772d214b6839ebffaa8c547c1628ffe62e99.tar.gz | |
Revert "SERVER-29887 address clang-4.0 warnings in geo code"
This reverts commit 8204c7dacf17851057dda165e6d1638cbff70cbf.
Diffstat (limited to 'src/third_party/s2/util')
| -rwxr-xr-x | src/third_party/s2/util/math/mathutil.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/third_party/s2/util/math/mathutil.cc b/src/third_party/s2/util/math/mathutil.cc index 8a4c2e23cbc..7ca3b890f8a 100755 --- a/src/third_party/s2/util/math/mathutil.cc +++ b/src/third_party/s2/util/math/mathutil.cc @@ -27,13 +27,7 @@ using std::vector; return static_cast<IntOut>(x < 0 ? (x - 0.5) : (x + 0.5)); } -// MONGODB suppress clang-4.0 warning by disabling the following line, but leave it in for MSVC -// since removing it results in a linker error there. -// error: explicit instantiation of 'Round<int, double>' that occurs after an explicit -// specialization has no effect [-Werror,-Winstantiation-after-specialization] -#ifdef _MSC_VER template int MathUtil::Round<int,double>(double x); -#endif MathUtil::QuadraticRootType MathUtil::RealRootsForQuadratic(long double a, long double b, |