From 4fda7914535b275d4c85c5e1d1884e8afda68e19 Mon Sep 17 00:00:00 2001 From: "Adam C. Emerson" Date: Thu, 28 Mar 2019 21:16:11 -0400 Subject: [PATCH] common: Update zipkin_trace.h to work without using namespace Signed-off-by: Adam C. Emerson --- src/common/zipkin_trace.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/zipkin_trace.h b/src/common/zipkin_trace.h index 46e44d3aac2..5a960610d13 100644 --- a/src/common/zipkin_trace.h +++ b/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); -- 2.39.5