From: Samuel Just <sam.just@inktank.com>
Date: Thu, 17 Apr 2014 19:23:21 +0000 (-0700)
Subject: encoding: use unqualified name for encode/decode in boost::optional encoding
X-Git-Tag: v0.80-rc1~13^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7bb2011542d1fda158d0415bd02da02c620694ef;p=ceph.git

encoding: use unqualified name for encode/decode in boost::optional encoding

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/include/encoding.h b/src/include/encoding.h
index d0974823c1fb..434d1588321e 100644
--- a/src/include/encoding.h
+++ b/src/include/encoding.h
@@ -303,7 +303,7 @@ inline void encode(const boost::optional<T> &p, bufferlist &bl)
   __u8 present = static_cast<bool>(p);
   ::encode(present, bl);
   if (p)
-    ::encode(p.get(), bl);
+    encode(p.get(), bl);
 }
 
 template<typename T>
@@ -314,7 +314,7 @@ inline void decode(boost::optional<T> &p, bufferlist::iterator &bp)
   if (present) {
     T t;
     p = t;
-    ::decode(p.get(), bp);
+    decode(p.get(), bp);
   }
 }