import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / geometry / srs / projections / proj / denoy.hpp

diff --git a/ceph/src/boost/boost/geometry/srs/projections/proj/denoy.hpp b/ceph/src/boost/boost/geometry/srs/projections/proj/denoy.hpp
index afedae873483dd0ead137139f444353b94dc7ff2..cb5ca29311560f088cfacbb9a01577d2f29f8b25 100644 (file)
--- a/ceph/src/boost/boost/geometry/srs/projections/proj/denoy.hpp
+++ b/ceph/src/boost/boost/geometry/srs/projections/proj/denoy.hpp
@@ -1,13 +1,9 @@
-#ifndef BOOST_GEOMETRY_PROJECTIONS_DENOY_HPP
-#define BOOST_GEOMETRY_PROJECTIONS_DENOY_HPP
-
-// Boost.Geometry - extensions-gis-projections (based on PROJ4)
-// This file is automatically generated. DO NOT EDIT.
+// Boost.Geometry - gis-projections (based on PROJ4)
 
 // Copyright (c) 2008-2015 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2017.
-// Modifications copyright (c) 2017, 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,
@@ -19,7 +15,7 @@
 // PROJ4 is maintained by Frank Warmerdam
 // PROJ4 is converted to Boost.Geometry by Barend Gehrels
 
-// Last updated version of proj: 4.9.1
+// Last updated version of proj: 5.0.0
 
 // Original copyright notice:
 
@@ -41,6 +37,9 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+#ifndef BOOST_GEOMETRY_PROJECTIONS_DENOY_HPP
+#define BOOST_GEOMETRY_PROJECTIONS_DENOY_HPP
+
 #include <boost/geometry/srs/projections/impl/base_static.hpp>
 #include <boost/geometry/srs/projections/impl/base_dynamic.hpp>
 #include <boost/geometry/srs/projections/impl/projects.hpp>
@@ -49,12 +48,6 @@
 namespace boost { namespace geometry
 {
 
-namespace srs { namespace par4
-{
-    struct denoy {};
-
-}} //namespace srs::par4
-
 namespace projections
 {
     #ifndef DOXYGEN_NO_DETAIL
@@ -62,36 +55,25 @@ namespace projections
     {
 
             static const double C0 = 0.95;
-            //static const double C1 = -.08333333333333333333;
-            //static const double C3 = .00166666666666666666;
+            //static const double C1 = -0.08333333333333333333;
+            //static const double C3 = 0.00166666666666666666;
             static const double D1 = 0.9;
             static const double D5 = 0.03;
 
             template <typename T>
-            inline T C1() { return -.0833333333333333333333333333333; }
+            inline T C1() { return -0.0833333333333333333333333333333; }
             template <typename T>
-            inline T C3() { return .0016666666666666666666666666666; }
+            inline T C3() { return 0.0016666666666666666666666666666; }
 
-            // template class, using CRTP to implement forward/inverse
-            template <typename CalculationType, typename Parameters>
-            struct base_denoy_spheroid : public base_t_f<base_denoy_spheroid<CalculationType, Parameters>,
-                     CalculationType, Parameters>
+            template <typename T, typename Parameters>
+            struct base_denoy_spheroid
             {
-
-                typedef CalculationType geographic_type;
-                typedef CalculationType cartesian_type;
-
-
-                inline base_denoy_spheroid(const Parameters& par)
-                    : base_t_f<base_denoy_spheroid<CalculationType, Parameters>,
-                     CalculationType, Parameters>(*this, par) {}
-
                 // FORWARD(s_forward)  spheroid
                 // Project coordinates from geographic (lon, lat) to cartesian (x, y)
-                inline void fwd(geographic_type& lp_lon, geographic_type& lp_lat, cartesian_type& xy_x, cartesian_type& xy_y) const
+                inline void fwd(Parameters const& , T lp_lon, T const& lp_lat, T& xy_x, T& xy_y) const
                 {
-                    static const CalculationType C1 = denoy::C1<CalculationType>();
-                    static const CalculationType C3 = denoy::C3<CalculationType>();
+                    static const T C1 = denoy::C1<T>();
+                    static const T C3 = denoy::C3<T>();
 
                     xy_y = lp_lat;
                     xy_x = lp_lon;
@@ -111,7 +93,7 @@ namespace projections
             template <typename Parameters>
             inline void setup_denoy(Parameters& par)
             {
-                par.es = 0.;
+                par.es = 0.0;
             }
 
     }} // namespace detail::denoy
@@ -130,12 +112,13 @@ namespace projections
         \par Example
         \image html ex_denoy.gif
     */
-    template <typename CalculationType, typename Parameters>
-    struct denoy_spheroid : public detail::denoy::base_denoy_spheroid<CalculationType, Parameters>
+    template <typename T, typename Parameters>
+    struct denoy_spheroid : public detail::denoy::base_denoy_spheroid<T, Parameters>
     {
-        inline denoy_spheroid(const Parameters& par) : detail::denoy::base_denoy_spheroid<CalculationType, Parameters>(par)
+        template <typename Params>
+        inline denoy_spheroid(Params const& , Parameters & par)
         {
-            detail::denoy::setup_denoy(this->m_par);
+            detail::denoy::setup_denoy(par);
         }
     };
 
@@ -144,23 +127,14 @@ namespace projections
     {
 
         // Static projection
-        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION(srs::par4::denoy, denoy_spheroid, denoy_spheroid)
+        BOOST_GEOMETRY_PROJECTIONS_DETAIL_STATIC_PROJECTION_F(srs::spar::proj_denoy, denoy_spheroid)
 
         // Factory entry(s)
-        template <typename CalculationType, typename Parameters>
-        class denoy_entry : public detail::factory_entry<CalculationType, Parameters>
-        {
-            public :
-                virtual base_v<CalculationType, Parameters>* create_new(const Parameters& par) const
-                {
-                    return new base_v_f<denoy_spheroid<CalculationType, Parameters>, CalculationType, Parameters>(par);
-                }
-        };
-
-        template <typename CalculationType, typename Parameters>
-        inline void denoy_init(detail::base_factory<CalculationType, Parameters>& factory)
+        BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_ENTRY_F(denoy_entry, denoy_spheroid)
+        
+        BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_BEGIN(denoy_init)
         {
-            factory.add_to_factory("denoy", new denoy_entry<CalculationType, Parameters>);
+            BOOST_GEOMETRY_PROJECTIONS_DETAIL_FACTORY_INIT_ENTRY(denoy, denoy_entry);
         }
 
     } // namespace detail