import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / geometry / algorithms / detail / overlay / stream_info.hpp

diff --git a/ceph/src/boost/boost/geometry/algorithms/detail/overlay/stream_info.hpp b/ceph/src/boost/boost/geometry/algorithms/detail/overlay/stream_info.hpp
index 51fd1b3dca6eacec3482178286e35212a3bb209b..307d9ff805fb830efe128ae5c5cc4d398d1a0e25 100644 (file)
--- a/ceph/src/boost/boost/geometry/algorithms/detail/overlay/stream_info.hpp
+++ b/ceph/src/boost/boost/geometry/algorithms/detail/overlay/stream_info.hpp
@@ -2,6 +2,11 @@
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2018.
+// Modifications copyright (c) 2018 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)
@@ -12,7 +17,7 @@
 
 #include <string>
 
-#include <boost/array.hpp>
+#include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
 
 
 namespace boost { namespace geometry
@@ -32,8 +37,8 @@ namespace detail { namespace overlay
         return h == 0 ? "-" : (h == 1 ? "A" : "D");
     }
 
-    template <typename P>
-    std::ostream& operator<<(std::ostream &os, turn_info<P> const& info)
+    template <typename P, typename SR, typename O, typename C>
+    std::ostream& operator<<(std::ostream &os, turn_info<P, SR, O, C> const& info)
     {
         os  << "\t"
             << " src " << info.seg_id.source_index
@@ -46,10 +51,10 @@ namespace detail { namespace overlay
                 << (info.opposite ? " o" : "")
                 << "]"
             << " sd "
-                << dir(info.sides.get<0,0>())
-                << dir(info.sides.get<0,1>())
-                << dir(info.sides.get<1,0>())
-                << dir(info.sides.get<1,1>())
+                << dir(info.sides.template get<0,0>())
+                << dir(info.sides.template get<0,1>())
+                << dir(info.sides.template get<1,0>())
+                << dir(info.sides.template get<1,1>())
             << " nxt seg " << info.travels_to_vertex_index
             << " , ip " << info.travels_to_ip_index
             << " , or " << info.next_ip_index