Imported Upstream version 1.72.0

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

diff --git a/boost/geometry/srs/projections/proj/denoy.hpp b/boost/geometry/srs/projections/proj/denoy.hpp
index 0f34475..cb5ca29 100644 (file)
--- a/boost/geometry/srs/projections/proj/denoy.hpp
+++ b/boost/geometry/srs/projections/proj/denoy.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,
@@ -65,18 +65,12 @@ namespace projections
             template <typename T>
             inline T C3() { return 0.0016666666666666666666666666666; }
 
-            // template class, using CRTP to implement forward/inverse
             template <typename T, typename Parameters>
             struct base_denoy_spheroid
-                : public base_t_f<base_denoy_spheroid<T, Parameters>, T, Parameters>
             {
-                inline base_denoy_spheroid(const Parameters& par)
-                    : base_t_f<base_denoy_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 lp_lon, T const& lp_lat, T& xy_x, T& xy_y) const
+                inline void fwd(Parameters const& , T lp_lon, T const& lp_lat, T& xy_x, T& xy_y) const
                 {
                     static const T C1 = denoy::C1<T>();
                     static const T C3 = denoy::C3<T>();
@@ -122,10 +116,9 @@ namespace projections
     struct denoy_spheroid : public detail::denoy::base_denoy_spheroid<T, Parameters>
     {
         template <typename Params>
-        inline denoy_spheroid(Params const& , Parameters const& par)
-            : detail::denoy::base_denoy_spheroid<T, Parameters>(par)
+        inline denoy_spheroid(Params const& , Parameters & par)
         {
-            detail::denoy::setup_denoy(this->m_par);
+            detail::denoy::setup_denoy(par);
         }
     };
 
@@ -134,7 +127,7 @@ namespace projections
     {
 
         // Static projection
-        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::spar::proj_denoy, denoy_spheroid, denoy_spheroid)
+        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_F(srs::spar::proj_denoy, denoy_spheroid)
 
         // Factory entry(s)
         BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_F(denoy_entry, denoy_spheroid)