update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / libs / geometry / test / string_from_type.hpp

diff --git a/ceph/src/boost/libs/geometry/test/string_from_type.hpp b/ceph/src/boost/libs/geometry/test/string_from_type.hpp
index 8d2bd6db84b11ec2bd08e1e1571c4b253018a549..5a8bdaff1dd950b979f49d271396d57fec8a0bb2 100644 (file)
--- a/ceph/src/boost/libs/geometry/test/string_from_type.hpp
+++ b/ceph/src/boost/libs/geometry/test/string_from_type.hpp
@@ -4,10 +4,10 @@
 // Copyright (c) 2008-2015 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2015 Mateusz Loskot, London, UK.
 
-// This file was modified by Oracle on 2015.
-// Modifications copyright (c) 2015, Oracle and/or its affiliates.
-
+// This file was modified by Oracle on 2015-2021.
+// Modifications copyright (c) 2015-2021, Oracle and/or its affiliates.
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -24,7 +24,8 @@
 #include <boost/multiprecision/cpp_bin_float.hpp>
 
 template <typename T>
-struct string_from_type {};
+struct string_from_type
+{ static std::string name() { return "?"; }  };
 
 template <> struct string_from_type<void>
 { static std::string name() { return "v"; }  };
@@ -47,14 +48,13 @@ template <> struct string_from_type<int>
 template <> struct string_from_type<long>
 { static std::string name() { return "l"; }  };
 
-template <> struct string_from_type<boost::multiprecision::cpp_bin_float_100>
+template <typename Backend>
+struct string_from_type<boost::multiprecision::number<Backend>>
 { static std::string name() { return "m"; }  };
 
-#if defined(BOOST_HAS_LONG_LONG)
 // this is what g++ and clang++ use
-template <> struct string_from_type<boost::long_long_type>
+template <> struct string_from_type<long long>
 { static std::string name() { return "x"; }  };
-#endif
 
 #if defined(BOOST_HAS_INT128)
 // this is what g++ and clang++ use