import 14.2.4 nautilus point release

[ceph.git] / ceph / src / include / buffer.h

diff --git a/ceph/src/include/buffer.h b/ceph/src/include/buffer.h
index e5a581ca5b0b58fb52fb6829c3fdf455cb9245d4..b8c78210eae0e81057f0396f91c1678ae4716b8a 100644 (file)
--- a/ceph/src/include/buffer.h
+++ b/ceph/src/include/buffer.h
@@ -104,6 +104,8 @@ struct unique_leakable_ptr : public std::unique_ptr<T, ceph::nop_delete<T>> {
 };
 
 namespace buffer CEPH_BUFFER_API {
+inline namespace v14_2_0 {
+
   /*
    * exceptions
    */
@@ -189,8 +191,6 @@ namespace buffer CEPH_BUFFER_API {
   raw* create_msg(unsigned len, char *buf, XioDispatchHook *m_hook);
 #endif
 
-inline namespace v14_2_0 {
-
   /*
    * a buffer pointer.  references (a subsequence of) a raw buffer.
    */
@@ -1308,7 +1308,7 @@ inline bool operator<=(bufferlist& l, bufferlist& r) {
 
 std::ostream& operator<<(std::ostream& out, const buffer::ptr& bp);
 
-std::ostream& operator<<(std::ostream& out, const raw &r);
+std::ostream& operator<<(std::ostream& out, const buffer::raw &r);
 
 std::ostream& operator<<(std::ostream& out, const buffer::list& bl);