From: Adam C. Emerson <aemerson@redhat.com>
Date: Fri, 29 Mar 2019 01:16:11 +0000 (-0400)
Subject: common: Update zipkin_trace.h to work without using namespace
X-Git-Tag: v15.0.0~19^2~38
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4fda7914535b275d4c85c5e1d1884e8afda68e19;p=ceph.git

common: Update zipkin_trace.h to work without using namespace

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---

diff --git a/src/common/zipkin_trace.h b/src/common/zipkin_trace.h
index 46e44d3aac22..5a960610d13e 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);