update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / test / cls_log / test_cls_log.cc

diff --git a/ceph/src/test/cls_log/test_cls_log.cc b/ceph/src/test/cls_log/test_cls_log.cc
index ca5ebafaf9bc26b699e4dcfff1be37db0ec010ec..05485035ae02d8b115dd830f3cb2d576052329da 100644 (file)
--- a/ceph/src/test/cls_log/test_cls_log.cc
+++ b/ceph/src/test/cls_log/test_cls_log.cc
@@ -10,7 +10,7 @@
 #include "global/global_context.h"
 
 #include "gtest/gtest.h"
-#include "test/librados/test.h"
+#include "test/librados/test_cxx.h"
 
 #include <errno.h>
 #include <string>
@@ -31,10 +31,10 @@ static void reset_rop(librados::ObjectReadOperation **pop) {
 
 static int read_bl(bufferlist& bl, int *i)
 {
-  bufferlist::iterator iter = bl.begin();
+  auto iter = bl.cbegin();
 
   try {
-    ::decode(*i, iter);
+    decode(*i, iter);
   } catch (buffer::error& err) {
     std::cout << "failed to decode buffer" << std::endl;
     return -EIO;
@@ -46,7 +46,7 @@ static int read_bl(bufferlist& bl, int *i)
 void add_log(librados::ObjectWriteOperation *op, utime_t& timestamp, string& section, string&name, int i)
 {
   bufferlist bl;
-  ::encode(i, bl);
+  encode(i, bl);
 
   cls_log_add(*op, timestamp, section, name, bl);
 }