update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / boost / boost / geometry / strategies / area.hpp

diff --git a/ceph/src/boost/boost/geometry/strategies/area.hpp b/ceph/src/boost/boost/geometry/strategies/area.hpp
index e192d9b28bb191fdc7c2db99f2fecf2423c4a3c3..866f37e8467b5c6f99d4061339876389916b0924 100644 (file)
--- a/ceph/src/boost/boost/geometry/strategies/area.hpp
+++ b/ceph/src/boost/boost/geometry/strategies/area.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) 2017 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -14,35 +15,76 @@
 #ifndef BOOST_GEOMETRY_STRATEGIES_AREA_HPP
 #define BOOST_GEOMETRY_STRATEGIES_AREA_HPP
 
+
+#include <boost/geometry/core/coordinate_type.hpp>
+#include <boost/geometry/util/select_most_precise.hpp>
+
 #include <boost/mpl/assert.hpp>
 
-#include <boost/geometry/strategies/tags.hpp>
 
 namespace boost { namespace geometry
 {
 
 
-namespace strategy { namespace area { namespace services
+namespace strategy { namespace area
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail
+{
+
+// If user specified a CalculationType, use that type, whatever it is
+//   and whatever the Geometry is.
+// Else, use Geometry's coordinate-type promoted to double if needed.
+template
+<
+    typename Geometry,
+    typename CalculationType
+>
+struct result_type
+{
+    typedef CalculationType type;
+};
+
+template
+<
+    typename Geometry
+>
+struct result_type<Geometry, void>
+    : select_most_precise
+        <
+            typename coordinate_type<Geometry>::type,
+            double
+        >
+{};
+
+} // namespace detail
+#endif // DOXYGEN_NO_DETAIL
+    
+
+namespace services
 {
 
 /*!
     \brief Traits class binding a default area strategy to a coordinate system
     \ingroup area
     \tparam Tag tag of coordinate system
-    \tparam PointOfSegment point-type
 */
-template <typename Tag, typename PointOfSegment>
+template <typename Tag>
 struct default_strategy
 {
     BOOST_MPL_ASSERT_MSG
         (
-            false, NOT_IMPLEMENTED_FOR_THIS_POINT_TYPE
-            , (types<PointOfSegment>)
+            false, NOT_IMPLEMENTED_FOR_THIS_COORDINATE_SYSTEM
+            , (types<Tag>)
         );
 };
 
 
-}}} // namespace strategy::area::services
+} // namespace services
+
+}} // namespace strategy::area
 
 
 }} // namespace boost::geometry