import quincy beta 17.1.0

[ceph.git] / ceph / src / os / kstore / KStore.h

diff --git a/ceph/src/os/kstore/KStore.h b/ceph/src/os/kstore/KStore.h
index b76b4dcfb36abe48a38945fd4b5dcb5d30b70e41..d7d95acdfbde5bcdc8801ab899910eb7770a4c2e 100644 (file)
--- a/ceph/src/os/kstore/KStore.h
+++ b/ceph/src/os/kstore/KStore.h
@@ -26,7 +26,6 @@
 #include "include/ceph_assert.h"
 #include "include/unordered_map.h"
 #include "common/Finisher.h"
-#include "common/RWLock.h"
 #include "common/Throttle.h"
 #include "common/WorkQueue.h"
 #include "os/ObjectStore.h"
@@ -487,7 +486,9 @@ public:
   using ObjectStore::getattr;
   int getattr(CollectionHandle& c, const ghobject_t& oid, const char *name, ceph::buffer::ptr& value) override;
   using ObjectStore::getattrs;
-  int getattrs(CollectionHandle& c, const ghobject_t& oid, std::map<std::string,ceph::buffer::ptr>& aset) override;
+  int getattrs(CollectionHandle& c,
+              const ghobject_t& oid,
+              std::map<std::string,ceph::buffer::ptr,std::less<>>& aset) override;
 
   int list_collections(std::vector<coll_t>& ls) override;
   bool collection_exists(const coll_t& c) override;