Imported Upstream version 1.72.0

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

diff --git a/boost/geometry/srs/projections/grids.hpp b/boost/geometry/srs/projections/grids.hpp
index 611344c..315ac4a 100644 (file)
--- a/boost/geometry/srs/projections/grids.hpp
+++ b/boost/geometry/srs/projections/grids.hpp
@@ -1,7 +1,7 @@
 // Boost.Geometry
 
-// This file was modified by Oracle on 2018.
-// Modifications copyright (c) 2018, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2018, 2019.
+// Modifications copyright (c) 2018, 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,
@@ -20,37 +20,14 @@
 namespace boost { namespace geometry
 {
 
-namespace srs
-{
-
-// Forward declarations for functions declarations below
-class grids;
-
-template <typename GridsStorage>
-class projection_grids;
 
-} // namespace srs
 namespace projections { namespace detail
 {
 
-// Forward declaratios of grids friends
-template <typename StreamPolicy>
-inline bool pj_gridlist_merge_gridfile(std::string const& gridname,
-                                       StreamPolicy const& stream_policy,
-                                       srs::grids & grids,
-                                       std::vector<std::size_t> & gridindexes);
-template <bool Inverse, typename CalcT, typename StreamPolicy, typename Range>
-inline bool pj_apply_gridshift_3(StreamPolicy const& stream_policy,
-                                 Range & range,
-                                 srs::grids & grids,
-                                 std::vector<std::size_t> const& gridindexes);
-
-// Forward declaratios of projection_grids friends
-template <typename Par, typename GridsStorage>
-inline void pj_gridlist_from_nadgrids(Par const& defn,
-                                      srs::projection_grids<GridsStorage> & grids);
-template <bool Inverse, typename Par, typename Range, typename Grids>
-inline bool pj_apply_gridshift_2(Par const& defn, Range & range, Grids const& grids);
+
+struct grids_tag {};
+struct shared_grids_tag {};
+
 
 }} // namespace projections::detail
 
@@ -70,22 +47,9 @@ public:
         return gridinfo.empty();
     }
 
-private:
-    template <typename StreamPolicy>
-    friend inline bool projections::detail::pj_gridlist_merge_gridfile(
-                            std::string const& gridname,
-                            StreamPolicy const& stream_policy,
-                            srs::grids & grids,
-                            std::vector<std::size_t> & gridindexes);
-    template <bool Inverse, typename CalcT, typename StreamPolicy, typename Range>
-    friend inline bool projections::detail::pj_apply_gridshift_3(
-                            StreamPolicy const& stream_policy,
-                            Range & range,
-                            srs::grids & grids,
-                            std::vector<std::size_t> const& gridindexes);
+    typedef projections::detail::grids_tag tag;
 
     projections::detail::pj_gridinfo gridinfo;
-
 };
 
 struct ifstream_policy
@@ -125,29 +89,20 @@ class projection_grids
 {
 public:
     projection_grids(GridsStorage & storage)
-        : storage_ptr(boost::addressof(storage))
+        : m_storage_ptr(boost::addressof(storage))
     {}
 
-    std::size_t size() const
-    {
-        return hindexes.size();
-    }
+    typedef GridsStorage grids_storage_type;
 
-    bool empty() const
+    GridsStorage & grids_storage() const
     {
-        return hindexes.empty();
+        return *m_storage_ptr;
     }
 
 private:
-    template <typename Par, typename GridsStor>
-    friend inline void projections::detail::pj_gridlist_from_nadgrids(
-                            Par const& defn,
-                            srs::projection_grids<GridsStor> & grids);
-    template <bool Inverse, typename Par, typename Range, typename Grids>
-    friend inline bool projections::detail::pj_apply_gridshift_2(
-                            Par const& defn, Range & range, Grids const& grids);
-
-    GridsStorage * const storage_ptr;
+    GridsStorage * const m_storage_ptr;
+
+public:
     std::vector<std::size_t> hindexes;
 };