Imported Upstream version 1.72.0

[platform/upstream/boost.git] / boost / geometry / srs / projections / proj / putp4p.hpp

diff --git a/boost/geometry/srs/projections/proj/putp4p.hpp b/boost/geometry/srs/projections/proj/putp4p.hpp
index bf408b8..f510557 100644 (file)
--- a/boost/geometry/srs/projections/proj/putp4p.hpp
+++ b/boost/geometry/srs/projections/proj/putp4p.hpp
@@ -2,8 +2,8 @@
 
 // Copyright (c) 2008-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2017, 2018.
-// Modifications copyright (c) 2017-2018, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2017, 2018, 2019.
+// Modifications copyright (c) 2017-2019, Oracle and/or its affiliates.
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle.
 
 // Use, modification and distribution is subject to the Boost Software License,
@@ -60,20 +60,14 @@ namespace projections
                 T    C_x, C_y;
             };
 
-            // template class, using CRTP to implement forward/inverse
             template <typename T, typename Parameters>
             struct base_putp4p_spheroid
-                : public base_t_fi<base_putp4p_spheroid<T, Parameters>, T, Parameters>
             {
                 par_putp4p<T> m_proj_parm;
 
-                inline base_putp4p_spheroid(const Parameters& par)
-                    : base_t_fi<base_putp4p_spheroid<T, Parameters>,
-                     T, Parameters>(*this, par) {}
-
                 // FORWARD(s_forward)  spheroid
                 // Project coordinates from geographic (lon, lat) to cartesian (x, y)
-                inline void fwd(T const& lp_lon, T lp_lat, T& xy_x, T& xy_y) const
+                inline void fwd(Parameters const& , T const& lp_lon, T lp_lat, T& xy_x, T& xy_y) const
                 {
                     static T const third = detail::third<T>();
 
@@ -85,7 +79,7 @@ namespace projections
 
                 // INVERSE(s_inverse)  spheroid
                 // Project coordinates from cartesian (x, y) to geographic (lon, lat)
-                inline void inv(T const& xy_x, T const& xy_y, T& lp_lon, T& lp_lat) const
+                inline void inv(Parameters const& , T const& xy_x, T const& xy_y, T& lp_lon, T& lp_lat) const
                 {
                     lp_lat = aasin(xy_y / this->m_proj_parm.C_y);
                     lp_lon = xy_x * cos(lp_lat) / this->m_proj_parm.C_x;
@@ -141,10 +135,9 @@ namespace projections
     struct putp4p_spheroid : public detail::putp4p::base_putp4p_spheroid<T, Parameters>
     {
         template <typename Params>
-        inline putp4p_spheroid(Params const& , Parameters const& par)
-            : detail::putp4p::base_putp4p_spheroid<T, Parameters>(par)
+        inline putp4p_spheroid(Params const& , Parameters & par)
         {
-            detail::putp4p::setup_putp4p(this->m_par, this->m_proj_parm);
+            detail::putp4p::setup_putp4p(par, this->m_proj_parm);
         }
     };
 
@@ -164,10 +157,9 @@ namespace projections
     struct weren_spheroid : public detail::putp4p::base_putp4p_spheroid<T, Parameters>
     {
         template <typename Params>
-        inline weren_spheroid(Params const& , Parameters const& par)
-            : detail::putp4p::base_putp4p_spheroid<T, Parameters>(par)
+        inline weren_spheroid(Params const& , Parameters & par)
         {
-            detail::putp4p::setup_weren(this->m_par, this->m_proj_parm);
+            detail::putp4p::setup_weren(par, this->m_proj_parm);
         }
     };
 
@@ -176,8 +168,8 @@ namespace projections
     {
 
         // Static projection
-        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::spar::proj_putp4p, putp4p_spheroid, putp4p_spheroid)
-        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::spar::proj_weren, weren_spheroid, weren_spheroid)
+        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_FI(srs::spar::proj_putp4p, putp4p_spheroid)
+        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_FI(srs::spar::proj_weren, weren_spheroid)
 
         // Factory entry(s)
         BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_FI(putp4p_entry, putp4p_spheroid)