From: David Zafman <dzafman@redhat.com>
Date: Fri, 26 Sep 2014 22:34:29 +0000 (-0700)
Subject: rados: Fix ObjectIterator instantiation to specify correct value_type
X-Git-Tag: v0.89~36^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b5ca73560be66bab8eac540dbd3b8ba89582c2dd;p=ceph.git

rados: Fix ObjectIterator instantiation to specify correct value_type

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index bf00c3aa65cf..c3882bf0c097 100644
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -63,7 +63,7 @@ namespace librados
   typedef void *completion_t;
   typedef void (*callback_t)(completion_t cb, void *arg);
 
-  class ObjectIterator : public std::iterator <std::forward_iterator_tag, std::string> {
+  class ObjectIterator : public std::iterator <std::forward_iterator_tag, std::pair<std::string, std::string> > {
   public:
     static const ObjectIterator __EndObjectIterator;
     ObjectIterator() {}