update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / mon / PGMap.h

diff --git a/ceph/src/mon/PGMap.h b/ceph/src/mon/PGMap.h
index d9b2c874c208d609233a34b9933815ae4f37f125..6488cc895c76f1791a41023d960723c273d40238 100644 (file)
--- a/ceph/src/mon/PGMap.h
+++ b/ceph/src/mon/PGMap.h
@@ -492,12 +492,12 @@ public:
   void get_filtered_pg_stats(uint64_t state, int64_t poolid, int64_t osdid,
                              bool primary, std::set<pg_t>& pgs) const;
 
-  set<std::string> osd_parentage(const OSDMap& osdmap, int id) const;
+  std::set<std::string> osd_parentage(const OSDMap& osdmap, int id) const;
   void get_health_checks(
     CephContext *cct,
     const OSDMap& osdmap,
     health_check_map_t *checks) const;
-  void print_summary(ceph::Formatter *f, ostream *out) const;
+  void print_summary(ceph::Formatter *f, std::ostream *out) const;
 
   static void generate_test_instances(std::list<PGMap*>& o);
 };