[Boost-commit] svn:boost r77178 - trunk/boost/geometry/extensions/gis/projections/proj

Subject: [Boost-commit] svn:boost r77178 - trunk/boost/geometry/extensions/gis/projections/proj
From: barend.gehrels_at_[hidden]
Date: 2012-03-03 11:22:44

Author: barendgehrels
Date: 2012-03-03 11:22:43 EST (Sat, 03 Mar 2012)
New Revision: 77178
URL: http://svn.boost.org/trac/boost/changeset/77178

Log:
Boost.Geometry Projection: applied patch (submitted by Krzysztof Czainski) to avoid cosl, causing problems for some compilers
Text files modified: 
   trunk/boost/geometry/extensions/gis/projections/proj/sterea.hpp |     8 ++++----                                
   1 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/boost/geometry/extensions/gis/projections/proj/sterea.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/proj/sterea.hpp	(original)
+++ trunk/boost/geometry/extensions/gis/projections/proj/sterea.hpp	2012-03-03 11:22:43 EST (Sat, 03 Mar 2012)
@@ -80,15 +80,15 @@
 
                 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