From: Adam C. Emerson <aemerson@redhat.com>
Date: Sat, 23 Dec 2017 04:56:24 +0000 (-0500)
Subject: kv: Use unqualified encode/decode
X-Git-Tag: v13.0.2~540^2~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16fec46e5b641cddce9ad879ed5a28a563342c52;p=ceph.git

kv: Use unqualified encode/decode

This is a portion of the namespace project.

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

diff --git a/src/kv/KeyValueDB.h b/src/kv/KeyValueDB.h
index 60e32254e09d..0b5b061b6aa0 100644
--- a/src/kv/KeyValueDB.h
+++ b/src/kv/KeyValueDB.h
@@ -54,12 +54,12 @@ public:
       ) {
       bufferlist::iterator p = to_set_bl.begin();
       uint32_t num;
-      ::decode(num, p);
+      decode(num, p);
       while (num--) {
 	string key;
 	bufferlist value;
-	::decode(key, p);
-	::decode(value, p);
+	decode(key, p);
+	decode(value, p);
 	set(prefix, key, value);
       }
     }
@@ -85,10 +85,10 @@ public:
     ) {
       bufferlist::iterator p = keys_bl.begin();
       uint32_t num;
-      ::decode(num, p);
+      decode(num, p);
       while (num--) {
 	string key;
-	::decode(key, p);
+	decode(key, p);
 	rmkey(prefix, key);
       }
     }
diff --git a/src/kv/MemDB.cc b/src/kv/MemDB.cc
index 7e5ffac46f7f..dc5afae45d4e 100644
--- a/src/kv/MemDB.cc
+++ b/src/kv/MemDB.cc
@@ -53,8 +53,8 @@ static string make_key(const string &prefix, const string &value)
 
 void MemDB::_encode(mdb_iter_t iter, bufferlist &bl)
 {
-  ::encode(iter->first, bl);
-  ::encode(iter->second, bl);
+  encode(iter->first, bl);
+  encode(iter->second, bl);
 }
 
 std::string MemDB::_get_data_fn()