diff options
Diffstat (limited to 'boost/geometry/strategies/spherical/ssf.hpp')
| -rw-r--r-- | boost/geometry/strategies/spherical/ssf.hpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/boost/geometry/strategies/spherical/ssf.hpp b/boost/geometry/strategies/spherical/ssf.hpp index 81f3205e90..c99e5835e2 100644 --- a/boost/geometry/strategies/spherical/ssf.hpp +++ b/boost/geometry/strategies/spherical/ssf.hpp @@ -2,6 +2,10 @@ // Copyright (c) 2011-2012 Barend Gehrels, Amsterdam, the Netherlands. +// This file was modified by Oracle on 2016. +// Modifications copyright (c) 2016, 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, // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) @@ -9,8 +13,6 @@ #ifndef BOOST_GEOMETRY_STRATEGIES_SPHERICAL_SSF_HPP #define BOOST_GEOMETRY_STRATEGIES_SPHERICAL_SSF_HPP -#include <boost/mpl/if.hpp> -#include <boost/type_traits.hpp> #include <boost/geometry/core/cs.hpp> #include <boost/geometry/core/access.hpp> @@ -61,9 +63,9 @@ int spherical_side_formula(T const& lambda1, T const& delta1, + (c1x * c2y - c1y * c2x) * sin(delta); T zero = T(); - return dist > zero ? 1 - : dist < zero ? -1 - : 0; + return math::equals(dist, zero) ? 0 + : dist > zero ? 1 + : -1; // dist < zero } } |