diff options
| author | Charles Karney <charles.karney@sri.com> | 2020-10-26 13:58:42 -0400 |
|---|---|---|
| committer | Charles Karney <charles.karney@sri.com> | 2020-10-26 13:58:42 -0400 |
| commit | b3a20c5b9c6efbeb0d6f528aad1d4e6bb4332bfa (patch) | |
| tree | 5bdde1e0bc05c4021dfd63df6579fa8730fe56fa /src | |
| parent | 5d22d137b1be282bdc14c1d12ab8f669f58d41a6 (diff) | |
| download | PROJ-b3a20c5b9c6efbeb0d6f528aad1d4e6bb4332bfa.tar.gz PROJ-b3a20c5b9c6efbeb0d6f528aad1d4e6bb4332bfa.zip | |
Try to fix compiler complaints for max and constexpr sqrt
Diffstat (limited to 'src')
| -rw-r--r-- | src/apps/gie.cpp | 2 | ||||
| -rw-r--r-- | src/phi2.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/apps/gie.cpp b/src/apps/gie.cpp index 8940afde..2fe854fa 100644 --- a/src/apps/gie.cpp +++ b/src/apps/gie.cpp @@ -1124,7 +1124,7 @@ static const struct errno_vs_err_const lookup[] = { {"pjd_err_invalid_x_or_y" , -15}, {"pjd_err_wrong_format_dms_value" , -16}, {"pjd_err_non_conv_inv_meri_dist" , -17}, - {"pjd_err_non_con_inv_phi2" , -18}, + {"pjd_err_non_conv_sinhpsi2tanphi" , -18}, {"pjd_err_acos_asin_arg_too_large" , -19}, {"pjd_err_tolerance_condition" , -20}, {"pjd_err_conic_lat_equal" , -21}, diff --git a/src/phi2.cpp b/src/phi2.cpp index eb6d5c82..6e810240 100644 --- a/src/phi2.cpp +++ b/src/phi2.cpp @@ -2,6 +2,7 @@ #include <math.h> #include <limits> +#include <algorithm> #include "proj.h" #include "proj_internal.h" @@ -82,8 +83,8 @@ double pj_sinhpsi2tanphi(projCtx ctx, const double taup, const double e) { constexpr int numit = 5; // min iterations = 1, max iterations = 2; mean = 1.954 - constexpr double tol = sqrt(std::numeric_limits<double>::epsilon()) / 10; - constexpr double tmax = 2 / sqrt(std::numeric_limits<double>::epsilon()); + static const double tol = sqrt(std::numeric_limits<double>::epsilon()) / 10; + static const double tmax = 2 / sqrt(std::numeric_limits<double>::epsilon()); double e2m = 1 - e * e, tau = fabs(taup) > 70 ? taup * exp(e * atanh(e)) : taup / e2m, |