update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / boost / boost / geometry / algorithms / correct.hpp

diff --git a/ceph/src/boost/boost/geometry/algorithms/correct.hpp b/ceph/src/boost/boost/geometry/algorithms/correct.hpp
index 07e012fafa1b69e85c0110d36c540651e1ba4112..21b9977ce54ea3e941973947057811311daf0d23 100644 (file)
--- a/ceph/src/boost/boost/geometry/algorithms/correct.hpp
+++ b/ceph/src/boost/boost/geometry/algorithms/correct.hpp
@@ -3,7 +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) 2014 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2014-2017 Adam Wulkiewicz, Lodz, Poland.
 
 // This file was modified by Oracle on 2017.
 // Modifications copyright (c) 2017 Oracle and/or its affiliates.
@@ -144,7 +144,7 @@ struct correct_ring
         detail::correct_closure::close_or_open_ring<Ring>::apply(r);
 
         // Check area
-        typedef typename Strategy::return_type area_result_type;
+        typedef typename area_result<Ring, Strategy>::type area_result_type;
         Predicate<area_result_type> predicate;
         area_result_type const zero = 0;
         if (predicate(ring_area_type::apply(r, strategy), zero))
@@ -322,8 +322,7 @@ inline void correct(Geometry& geometry)
 
     typedef typename strategy::area::services::default_strategy
         <
-            typename cs_tag<point_type>::type,
-            point_type
+            typename cs_tag<point_type>::type
         >::type strategy_type;
 
     resolve_variant::correct<Geometry>::apply(geometry, strategy_type());