librbd: fully specify std::string in list function

diff --git a/src/include/rbd/librbd.hpp b/src/include/rbd/librbd.hpp
index 53755a7e42df40fc593abc5a935a9f580fb30e15..3f389d5a75d588f4f5f1f44caf9f56383cbd6c0f 100644 (file)
--- a/src/include/rbd/librbd.hpp
+++ b/src/include/rbd/librbd.hpp
@@ -72,7 +72,7 @@ public:
   int open_pool(const char *pool_name, pool_t *pool);
   int close_pool(pool_t pool);
 
-  int list(pool_t pool, std::vector<string>& names);
+  int list(pool_t pool, std::vector<std::string>& names);
   int create(pool_t pool, const char *name, size_t size, int *order);
   int remove(pool_t pool, const char *name);
   int copy(pool_t src_pool, const char *srcname, pool_t dest_pool, const char *destname);

diff --git a/src/librbd.cc b/src/librbd.cc
index c9d5f53323620af0aca63a1485533b6f3928313e..c9be756a3b29b7ec61cee27b7919468500ebdfe2 100644 (file)
--- a/src/librbd.cc
+++ b/src/librbd.cc
@@ -488,7 +488,7 @@ int librbd::RBDClient::rollback_image(PoolCtx *pp, ImageCtx *ictx, uint64_t snap
   return 0;
 }
 
-int librbd::RBDClient::list(PoolCtx *pp, std::vector<string>& names)
+int librbd::RBDClient::list(PoolCtx *pp, std::vector<std::string>& names)
 {
   bufferlist bl;
   int r = rados.read(pp->md, RBD_DIRECTORY, 0, bl, 0);
@@ -1342,7 +1342,7 @@ int librbd::RBD::stat(image_t image, image_info_t& info)
   return r;
 }
 
-int librbd::RBD::list(pool_t pool, std::vector<string>& names)
+int librbd::RBD::list(pool_t pool, std::vector<std::string>& names)
 {
   PoolCtx *ctx = (PoolCtx *)pool;
   int r = client->list(ctx, names);
@@ -1561,7 +1561,7 @@ extern "C" int rbd_close_pool(rbd_pool_t pool)
 /* images */
 extern "C" int rbd_list(rbd_pool_t pool, char *names, size_t *size)
 {
-  std::vector<string> cpp_names;
+  std::vector<std::string> cpp_names;
   int r = rbd_client->list((librbd::PoolCtx *)pool, cpp_names);
   if (r == -ENOENT)
     return 0;