update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / boost / test / tools / detail / bitwise_manip.hpp

diff --git a/ceph/src/boost/boost/test/tools/detail/bitwise_manip.hpp b/ceph/src/boost/boost/test/tools/detail/bitwise_manip.hpp
index f8c9685c1074d1613f0c265fb8a3f5d70b0a2535..329a893a9a7b781171bfb450cf7362cf8050867b 100644 (file)
--- a/ceph/src/boost/boost/test/tools/detail/bitwise_manip.hpp
+++ b/ceph/src/boost/boost/test/tools/detail/bitwise_manip.hpp
@@ -34,12 +34,18 @@ namespace test_tools {
 // ************************************************************************** //
 
 //! Bitwise comparison manipulator
+//! This is a terminal for the expression
 struct bitwise {};
 
 //____________________________________________________________________________//
 
-inline int
-operator<<( unit_test::lazy_ostream const&, bitwise )   { return 0; }
+inline unit_test::lazy_ostream &
+operator<<( unit_test::lazy_ostream &o, bitwise )   { return o; }
+
+// needed for the lazy evaluation in lazy_ostream as bitwise is a terminal
+inline std::ostream& 
+operator<<( std::ostream& o, bitwise )              { return o; }
+
 
 //____________________________________________________________________________//
 
@@ -106,10 +112,10 @@ operator<<(assertion_evaluate_t<assertion::binary_expr<T1,T2,assertion::op::EQ<T
 
 //____________________________________________________________________________//
 
-inline check_type
+inline assertion_type
 operator<<( assertion_type const& , bitwise )
 {
-    return CHECK_BUILT_ASSERTION;
+    return assertion_type(CHECK_BUILT_ASSERTION);
 }
 
 //____________________________________________________________________________//