import quincy beta 17.1.0

[ceph.git] / ceph / src / mds / events / ESubtreeMap.h

diff --git a/ceph/src/mds/events/ESubtreeMap.h b/ceph/src/mds/events/ESubtreeMap.h
index 3dc824087f523b6d36fe6a04e46383dc1427240f..ebddff0439e82d3cc5db2ef78d9332f905d42cf4 100644 (file)
--- a/ceph/src/mds/events/ESubtreeMap.h
+++ b/ceph/src/mds/events/ESubtreeMap.h
@@ -21,14 +21,14 @@
 class ESubtreeMap : public LogEvent {
 public:
   EMetaBlob metablob;
-  map<dirfrag_t, vector<dirfrag_t> > subtrees;
-  set<dirfrag_t> ambiguous_subtrees;
+  std::map<dirfrag_t, std::vector<dirfrag_t> > subtrees;
+  std::set<dirfrag_t> ambiguous_subtrees;
   uint64_t expire_pos;
   uint64_t event_seq;
 
   ESubtreeMap() : LogEvent(EVENT_SUBTREEMAP), expire_pos(0), event_seq(0) { }
   
-  void print(ostream& out) const override {
+  void print(std::ostream& out) const override {
     out << "ESubtreeMap " << subtrees.size() << " subtrees " 
        << ", " << ambiguous_subtrees.size() << " ambiguous "
        << metablob;