import 15.2.0 Octopus source

[ceph.git] / ceph / src / common / zipkin_trace.h

diff --git a/ceph/src/common/zipkin_trace.h b/ceph/src/common/zipkin_trace.h
index 46e44d3aac229cbe7f69ad0b66ddc9837588ea4d..5a960610d13e43314dd3a63795ad89564511d62c 100644 (file)
--- a/ceph/src/common/zipkin_trace.h
+++ b/ceph/src/common/zipkin_trace.h
@@ -72,15 +72,17 @@ class Trace {
 
 #endif // !WITH_BLKIN
 
-static inline void encode(const blkin_trace_info& b, bufferlist& bl)
+static inline void encode(const blkin_trace_info& b, ceph::buffer::list& bl)
 {
+  using ceph::encode;
   encode(b.trace_id, bl);
   encode(b.span_id, bl);
   encode(b.parent_span_id, bl);
 }
 
-static inline void decode(blkin_trace_info& b, bufferlist::const_iterator& p)
+static inline void decode(blkin_trace_info& b, ceph::buffer::list::const_iterator& p)
 {
+  using ceph::decode;
   decode(b.trace_id, p);
   decode(b.span_id, p);
   decode(b.parent_span_id, p);