Merge pull request #1303 from awulkiew/fix/nsphere

[extensions] Fix nsphere access
boostorg · Sep 13, 2024 · 12cac83 · 12cac83
2 parents ad2a134 + 4c17e09
commit 12cac83
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/include/boost/geometry/extensions/nsphere/core/access.hpp b/include/boost/geometry/extensions/nsphere/core/access.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2020.
 // Modifications copyright (c) 2020, Oracle and/or its affiliates.
@@ -30,14 +31,14 @@ namespace boost { namespace geometry
 namespace core_dispatch
 {
 
-template <typename Nsphere, typename CoordinateType, std::size_t Dimension>
-struct access<nsphere_tag, Nsphere, CoordinateType, Dimension, std::false_type>
+template <typename Nsphere, std::size_t Dimension>
+struct access<nsphere_tag, Nsphere, Dimension, false>
 {
-    static inline CoordinateType get(Nsphere const& nsphere)
+    static inline coordinate_type_t<Nsphere> get(Nsphere const& nsphere)
     {
         return traits::access<Nsphere, Dimension>::get(nsphere);
     }
-    static inline void set(Nsphere& s, CoordinateType const& value)
+    static inline void set(Nsphere& s, coordinate_type_t<Nsphere> const& value)
     {
         traits::access<Nsphere, Dimension>::set(s, value);
     }

diff --git a/include/boost/geometry/extensions/nsphere/core/radius.hpp b/include/boost/geometry/extensions/nsphere/core/radius.hpp
@@ -3,10 +3,10 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2024 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2014-2020.
 // Modifications copyright (c) 2014-2020 Oracle and/or its affiliates.
-
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
@@ -44,7 +44,7 @@ struct radius_type<nsphere_tag, S>
 };
 
 template <typename S, std::size_t D>
-struct radius_access<nsphere_tag, S, D, std::false_type>
+struct radius_access<nsphere_tag, S, D, false>
     : detail::radius_access<nsphere_tag, S, D>
 {
     BOOST_STATIC_ASSERT((D == 0));