update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / boost / geometry / index / detail / rtree / utilities / print.hpp

diff --git a/ceph/src/boost/boost/geometry/index/detail/rtree/utilities/print.hpp b/ceph/src/boost/boost/geometry/index/detail/rtree/utilities/print.hpp
index 4c42659c643338f77429ff1c412fb9fb2ce60fad..d512add24393f73edc1a223f613cf51e6578af19 100644 (file)
--- a/ceph/src/boost/boost/geometry/index/detail/rtree/utilities/print.hpp
+++ b/ceph/src/boost/boost/geometry/index/detail/rtree/utilities/print.hpp
@@ -4,6 +4,10 @@
 //
 // Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
 //
+// This file was modified by Oracle on 2019.
+// Modifications copyright (c) 2019 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)
@@ -129,13 +133,16 @@ namespace rtree { namespace utilities {
 
 namespace visitors {
 
-template <typename Value, typename Options, typename Translator, typename Box, typename Allocators>
-struct print : public rtree::visitor<Value, typename Options::parameters_type, Box, Allocators, typename Options::node_tag, true>::type
+template <typename MembersHolder>
+struct print
+    : public MembersHolder::visitor_const
 {
-    typedef typename rtree::internal_node<Value, typename Options::parameters_type, Box, Allocators, typename Options::node_tag>::type internal_node;
-    typedef typename rtree::leaf<Value, typename Options::parameters_type, Box, Allocators, typename Options::node_tag>::type leaf;
+    typedef typename MembersHolder::translator_type translator_type;
+
+    typedef typename MembersHolder::internal_node internal_node;
+    typedef typename MembersHolder::leaf leaf;
 
-    inline print(std::ostream & o, Translator const& t)
+    inline print(std::ostream & o, translator_type const& t)
         : os(o), tr(t), level(0)
     {}
 
@@ -189,7 +196,7 @@ struct print : public rtree::visitor<Value, typename Options::parameters_type, B
     }
 
     std::ostream & os;
-    Translator const& tr;
+    translator_type const& tr;
 
     size_t level;
 };
@@ -203,11 +210,7 @@ void print(std::ostream & os, Rtree const& tree)
     RTV rtv(tree);
 
     visitors::print<
-        typename RTV::value_type,
-        typename RTV::options_type,
-        typename RTV::translator_type,
-        typename RTV::box_type,
-        typename RTV::allocators_type
+        typename RTV::members_holder
     > print_v(os, rtv.translator());
     rtv.apply_visitor(print_v);
 }