Skip to content

Commit

Permalink
Merge pull request #1303 from awulkiew/fix/nsphere
Browse files Browse the repository at this point in the history
[extensions] Fix nsphere access
  • Loading branch information
vissarion authored Sep 13, 2024
2 parents ad2a134 + 4c17e09 commit 12cac83
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
9 changes: 5 additions & 4 deletions include/boost/geometry/extensions/nsphere/core/access.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions include/boost/geometry/extensions/nsphere/core/radius.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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));
Expand Down

0 comments on commit 12cac83

Please sign in to comment.