]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
encoding: use unqualified name for encode/decode in boost::optional encoding
authorSamuel Just <sam.just@inktank.com>
Thu, 17 Apr 2014 19:23:21 +0000 (12:23 -0700)
committerSamuel Just <sam.just@inktank.com>
Mon, 21 Apr 2014 17:53:04 +0000 (10:53 -0700)
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/include/encoding.h

index d0974823c1fbc6c33ff902705ab3e61dd01aab97..434d1588321ec05c0b060409ae62ee0ccc78c840 100644 (file)
@@ -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);
   }
 }