update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / boost / qvm / quat_operations.hpp

diff --git a/ceph/src/boost/boost/qvm/quat_operations.hpp b/ceph/src/boost/boost/qvm/quat_operations.hpp
index 1c0cc4db72615a88d77bcb3b37b6440ee4ffbd98..7cce911061ec04777a857ec3247d044a2147b2f1 100644 (file)
--- a/ceph/src/boost/boost/qvm/quat_operations.hpp
+++ b/ceph/src/boost/boost/qvm/quat_operations.hpp
@@ -3,8 +3,8 @@
 //Distributed under 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)
 
-#ifndef UUID_E6519754D19211DFB8405F74DFD72085
-#define UUID_E6519754D19211DFB8405F74DFD72085
+#ifndef BOOST_QVM_E6519754D19211DFB8405F74DFD72085
+#define BOOST_QVM_E6519754D19211DFB8405F74DFD72085
 
 #include <boost/qvm/detail/quat_assign.hpp>
 #include <boost/qvm/deduce_quat.hpp>
@@ -78,9 +78,8 @@ boost
             bool>::type
         cmp( A const & a, B const & b, Cmp f )
             {
-            typedef typename deduce_scalar<
-                typename quat_traits<A>::scalar_type,
-                typename quat_traits<B>::scalar_type>::type T;
+            typedef typename quat_traits<A>::scalar_type T;
+            typedef typename quat_traits<B>::scalar_type U;
             T q1[4] =
                 {
                 quat_traits<A>::template read_element<0>(a),
@@ -88,7 +87,7 @@ boost
                 quat_traits<A>::template read_element<2>(a),
                 quat_traits<A>::template read_element<3>(a)
                 };
-            T q2[4] =
+            U q2[4] =
                 {
                 quat_traits<B>::template read_element<0>(b),
                 quat_traits<B>::template read_element<1>(b),