From a7361e278016fac110b4a70ee94a34d31ca35e87 Mon Sep 17 00:00:00 2001 From: Barend Gehrels Date: Sat, 3 Mar 2012 16:22:43 +0000 Subject: [PATCH] Boost.Geometry Projection: applied patch (submitted by Krzysztof Czainski) to avoid cosl, causing problems for some compilers [SVN r77178] --- .../geometry/extensions/gis/projections/proj/sterea.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/geometry/extensions/gis/projections/proj/sterea.hpp b/include/boost/geometry/extensions/gis/projections/proj/sterea.hpp index 1d5454dc7..e6f326791 100644 --- a/include/boost/geometry/extensions/gis/projections/proj/sterea.hpp +++ b/include/boost/geometry/extensions/gis/projections/proj/sterea.hpp @@ -80,15 +80,15 @@ namespace boost { namespace geometry { namespace projection inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const { - double cosc, sinc, cosl, k; + double cosc, sinc, cosl_, k; detail::gauss::gauss(m_proj_parm.en, lp_lon, lp_lat); sinc = sin(lp_lat); cosc = cos(lp_lat); - cosl = cos(lp_lon); - k = this->m_par.k0 * this->m_proj_parm.R2 / (1. + this->m_proj_parm.sinc0 * sinc + this->m_proj_parm.cosc0 * cosc * cosl); + cosl_ = cos(lp_lon); + k = this->m_par.k0 * this->m_proj_parm.R2 / (1. + this->m_proj_parm.sinc0 * sinc + this->m_proj_parm.cosc0 * cosc * cosl_); xy_x = k * cosc * sin(lp_lon); - xy_y = k * (this->m_proj_parm.cosc0 * sinc - this->m_proj_parm.sinc0 * cosc * cosl); + xy_y = k * (this->m_proj_parm.cosc0 * sinc - this->m_proj_parm.sinc0 * cosc * cosl_); } inline void inv(cartesian_type& xy_x, cartesian_type& xy_y, geographic_type& lp_lon, geographic_type& lp_lat) const